[Libreoffice-commits] core.git: 2 commits - include/svx svx/source

[Tor Lillqvist]

 include/svx/svddrag.hxx       |   19 -------------------
 svx/source/svdraw/svddrag.cxx |    2 --
 2 files changed, 21 deletions(-)

New commits:
commit 0fb498ccfd40a13bf99c3f36dd0cebebdaf55809
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 19 15:15:27 2014 +0200

    Remove unused fields
    
    Change-Id: Ia7d3b7e319f2a568120add15ef05915a98fe6696

diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 11109f2..fd43db2 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -48,9 +48,7 @@ protected:
     Point     aRef1;     // Referencepoint: Resize fixed point, (axis of rotation,
     Point     aRef2;     // axis of reflection, ...)
     Point     aPos0;     // Position at the last Event
-    Point     aRealPos0; // Position at the last Event
     Point     aRealNow;  // Current dragging position without Snap, Ortho and Limit
-    Point     aRealLast; // RealPos of the last Point (for MinMoved)
     Rectangle aActionRect;
 
     bool      bEndDragChangesAttributes;
diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx
index a45ef7b..3c0f109 100644
--- a/svx/source/svdraw/svddrag.cxx
+++ b/svx/source/svdraw/svddrag.cxx
@@ -60,13 +60,11 @@ void SdrDragStat::Reset(const Point& rPnt)
     Reset();
     Start()=rPnt;
     aPos0=rPnt;
-    aRealPos0=rPnt;
     RealNow()=rPnt;
 }
 
 void SdrDragStat::NextMove(const Point& rPnt)
 {
-    aRealPos0=GetRealNow();
     aPos0=GetNow();
     RealNow()=rPnt;
     Point aBla=KorregPos(GetRealNow(),GetPrev());
commit 861d87d5526a25aef49d8acc99ba5a8ee12a8337
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Mar 19 15:02:05 2014 +0200

    Drop unused "reserve" fields
    
    Probably a relic from the past, when people tried to avoid changing public
    headers incompatibly to avoid causing recompilations for their
    colleagues... We are long past such concerns. The talk about "extensions" in
    the comment is most likely obsolete.
    
    Change-Id: If90ca02685bf82ed529becb715b4c614287fdc57

diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index ef29454..11109f2 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -53,26 +53,9 @@ protected:
     Point     aRealLast; // RealPos of the last Point (for MinMoved)
     Rectangle aActionRect;
 
-    // Backup for compatible extensions which otherwise would become incompatible
-    Point     aReservePoint1;
-    Point     aReservePoint2;
-    Point     aReservePoint3;
-    Point     aReservePoint4;
-    Rectangle aReserveRect1;
-    Rectangle aReserveRect2;
     bool      bEndDragChangesAttributes;
     bool      bEndDragChangesGeoAndAttributes;
     bool      bMouseIsUp;
-    bool      aReserveBool3;
-    bool      aReserveBool4;
-    long      aReserveLong1;
-    long      aReserveLong2;
-    long      aReserveLong3;
-    long      aReserveLong4;
-    void*     aReservePtr1;
-    void*     aReservePtr2;
-    void*     aReservePtr3;
-    void*     aReservePtr4;
 
     bool      bShown;    // Xor visible?
     sal_uInt16    nMinMov;   // So much has to be minimally moved first