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

[Noel Grandin (via logerrit)]

 include/tools/gen.hxx        |    2 +-
 tools/source/generic/gen.cxx |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1ddf8be9bcb2151157823870fd0a03e022fdad60
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Jul 10 10:04:19 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jul 10 12:28:19 2019 +0200

    make tools::Rectangle::setX respect empty state
    
    and make non-inline so it is easy to disable this for debugging, if need
    be
    
    Change-Id: I2beae23bbdea36e91e0e367f9a94cbc35be3cd24
    Reviewed-on: https://gerrit.libreoffice.org/75337
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index ebe44840d964..9dfab3a17019 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -459,7 +459,7 @@ public:
     /// Returns the difference between bottom and top, assuming the range includes one end, but not the other.
     long                getHeight() const { return nBottom - nTop; }
     /// Set the left edge of the rectangle to x, preserving the width
-    void                setX( long x ) { nRight  += x - nLeft; nLeft = x; }
+    void                setX( long x );
     /// Set the top edge of the rectangle to y, preserving the height
     void                setY( long y ) { nBottom += y - nTop;  nTop  = y; }
     void                setWidth( long n ) { nRight = nLeft + n; }
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 021e421c3b80..db7980ea100a 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -275,5 +275,12 @@ long tools::Rectangle::AdjustBottom( long nVertMoveDelta )
     return nBottom;
 }
 
+void tools::Rectangle::setX( long x )
+{
+    if (nRight != RECT_EMPTY)
+        nRight += x - nLeft;
+    nLeft = x;
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */