|
 |
f325b2 |
From aff2d164a982917c57be5e8a18c6c1366b836c09 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Fri, 28 Aug 2015 15:13:41 +0100
|
|
|
f325b2 |
Subject: [PATCH] time stamp object selections and use newest as ref for
|
|
|
f325b2 |
equalization
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I1bf22ddbaf263b240288f70d03d6949611f86b69
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/svx/svdmark.hxx | 8 ++++++++
|
|
|
f325b2 |
svx/source/svdraw/svdedtv2.cxx | 18 ++++++++++++++++--
|
|
|
f325b2 |
svx/source/svdraw/svdmark.cxx | 12 +++++++++---
|
|
|
f325b2 |
3 files changed, 33 insertions(+), 5 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
|
|
|
f325b2 |
index cba0a75..aee9dd7 100644
|
|
|
f325b2 |
--- a/include/svx/svdmark.hxx
|
|
|
f325b2 |
+++ b/include/svx/svdmark.hxx
|
|
|
f325b2 |
@@ -42,7 +42,10 @@ typedef std::set<sal_uInt16> SdrUShortCont;
|
|
|
f325b2 |
// Everything a View needs to know about a selected object
|
|
|
f325b2 |
class SVX_DLLPUBLIC SdrMark : public sdr::ObjectUser
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+private:
|
|
|
f325b2 |
+ void setTime();
|
|
|
f325b2 |
protected:
|
|
|
f325b2 |
+ sal_Int64 mnTimeStamp;
|
|
|
f325b2 |
SdrObject* mpSelectedSdrObject; // the selected object
|
|
|
f325b2 |
SdrPageView* mpPageView;
|
|
|
f325b2 |
SdrUShortCont* mpPoints; // Selected Points
|
|
|
f325b2 |
@@ -145,6 +148,11 @@ public:
|
|
|
f325b2 |
|
|
|
f325b2 |
return mpGluePoints;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ sal_Int64 getTimeStamp() const
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ return mnTimeStamp;
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
};
|
|
|
f325b2 |
|
|
|
f325b2 |
class SVX_DLLPUBLIC SdrMarkList
|
|
|
f325b2 |
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
|
|
|
f325b2 |
index 719355d..090efa7 100644
|
|
|
f325b2 |
--- a/svx/source/svdraw/svdedtv2.cxx
|
|
|
f325b2 |
+++ b/svx/source/svdraw/svdedtv2.cxx
|
|
|
f325b2 |
@@ -1181,7 +1181,19 @@ void SdrEditView::EqualizeMarkedObjects(bool bWidth)
|
|
|
f325b2 |
if (nMarked < 2)
|
|
|
f325b2 |
return;
|
|
|
f325b2 |
|
|
|
f325b2 |
- SdrObject* pLastSelectedObj = rMarkList.GetMark(nMarked-1)->GetMarkedSdrObj();
|
|
|
f325b2 |
+ size_t nLastSelected = 0;
|
|
|
f325b2 |
+ sal_Int64 nLastSelectedTime = rMarkList.GetMark(0)->getTimeStamp();
|
|
|
f325b2 |
+ for (size_t a = 1; a < nMarked; ++a)
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ sal_Int64 nCandidateTime = rMarkList.GetMark(a)->getTimeStamp();
|
|
|
f325b2 |
+ if (nCandidateTime > nLastSelectedTime)
|
|
|
f325b2 |
+ {
|
|
|
f325b2 |
+ nLastSelectedTime = nCandidateTime;
|
|
|
f325b2 |
+ nLastSelected = a;
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
+ }
|
|
|
f325b2 |
+
|
|
|
f325b2 |
+ SdrObject* pLastSelectedObj = rMarkList.GetMark(nLastSelected)->GetMarkedSdrObj();
|
|
|
f325b2 |
Size aLastRectSize(pLastSelectedObj->GetLogicRect().GetSize());
|
|
|
f325b2 |
|
|
|
f325b2 |
const bool bUndo = IsUndoEnabled();
|
|
|
f325b2 |
@@ -1189,8 +1201,10 @@ void SdrEditView::EqualizeMarkedObjects(bool bWidth)
|
|
|
f325b2 |
if (bUndo)
|
|
|
f325b2 |
BegUndo();
|
|
|
f325b2 |
|
|
|
f325b2 |
- for (size_t a = 0; a < nMarked-1; ++a)
|
|
|
f325b2 |
+ for (size_t a = 0; a < nMarked; ++a)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ if (a == nLastSelected)
|
|
|
f325b2 |
+ continue;
|
|
|
f325b2 |
SdrMark* pM = rMarkList.GetMark(a);
|
|
|
f325b2 |
SdrObject* pObj = pM->GetMarkedSdrObj();
|
|
|
f325b2 |
Rectangle aLogicRect(pObj->GetLogicRect());
|
|
|
f325b2 |
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
|
|
|
f325b2 |
index 7ddde61..8b7f3e09c 100644
|
|
|
f325b2 |
--- a/svx/source/svdraw/svdmark.cxx
|
|
|
f325b2 |
+++ b/svx/source/svdraw/svdmark.cxx
|
|
|
f325b2 |
@@ -38,8 +38,12 @@
|
|
|
f325b2 |
#include <svl/SfxBroadcaster.hxx>
|
|
|
f325b2 |
#include <svx/svdoedge.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
-
|
|
|
f325b2 |
-
|
|
|
f325b2 |
+void SdrMark::setTime()
|
|
|
f325b2 |
+{
|
|
|
f325b2 |
+ TimeValue aNow;
|
|
|
f325b2 |
+ osl_getSystemTime(&aNow);
|
|
|
f325b2 |
+ mnTimeStamp = sal_Int64(aNow.Seconds) * 1000000000L + aNow.Nanosec;
|
|
|
f325b2 |
+}
|
|
|
f325b2 |
|
|
|
f325b2 |
SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView)
|
|
|
f325b2 |
: mpSelectedSdrObject(pNewObj),
|
|
|
f325b2 |
@@ -55,10 +59,12 @@ SdrMark::SdrMark(SdrObject* pNewObj, SdrPageView* pNewPageView)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
mpSelectedSdrObject->AddObjectUser( *this );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
+ setTime();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
SdrMark::SdrMark(const SdrMark& rMark)
|
|
|
f325b2 |
: ObjectUser(),
|
|
|
f325b2 |
+ mnTimeStamp(0),
|
|
|
f325b2 |
mpSelectedSdrObject(0L),
|
|
|
f325b2 |
mpPageView(0L),
|
|
|
f325b2 |
mpPoints(0L),
|
|
|
f325b2 |
@@ -117,10 +123,10 @@ void SdrMark::SetMarkedSdrObj(SdrObject* pNewObj)
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-
|
|
|
f325b2 |
SdrMark& SdrMark::operator=(const SdrMark& rMark)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SetMarkedSdrObj(rMark.mpSelectedSdrObject);
|
|
|
f325b2 |
+ mnTimeStamp = rMark.mnTimeStamp;
|
|
|
f325b2 |
mpPageView = rMark.mpPageView;
|
|
|
f325b2 |
mbCon1 = rMark.mbCon1;
|
|
|
f325b2 |
mbCon2 = rMark.mbCon2;
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.4.0
|
|
|
f325b2 |
|