[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-2' - svtools/source

László Németh laszlo.nemeth at collabora.com
Wed Sep 16 00:14:56 PDT 2015


 svtools/source/control/ruler.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 1bd52dd711cd4a563b08cc682ffa9d02b201e632
Author: László Németh <laszlo.nemeth at collabora.com>
Date:   Fri Sep 11 17:20:29 2015 +0200

    tdf#92145: Writer table rows/columns can't be resized
    
    with disabled rulers. (This fix was suggested by Tomaž Vajngerl.)
    
    (Cherry-picked from the commit ed031895f6f5b361cccc6811b53c6f2b9cfc3e23)
    
    Conflicts:
    	svtools/source/control/ruler.cxx
    
    Change-Id: I161237cdb4941c0eaf934223b078acd94d72e21d
    Reviewed-on: https://gerrit.libreoffice.org/18507
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 00379a83cad8a016c54b3d90fef472a2ca6aeb96)
    Reviewed-on: https://gerrit.libreoffice.org/18563
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index d4b9374..2d4486c 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2344,6 +2344,12 @@ bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType )
         // update ruler
         if ( mbFormat )
         {
+            if (!IsReallyVisible())
+            {
+                // set mpData for ImplDocHitTest()
+                ImplFormat(*this);
+            }
+
             Invalidate(INVALIDATE_NOERASE);
         }
 


More information about the Libreoffice-commits mailing list