[Libreoffice-commits] .: Branch 'libreoffice-3-3-0' - vcl/unx

Lubos Lunak llunak at kemper.freedesktop.org
Mon Jan 17 09:17:34 PST 2011


 vcl/unx/kde4/KDESalGraphics.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 94ba0c5b10f8089dc549e9fc4f3085622cff65c4
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Nov 3 15:17:33 2010 +0100

    use sane scrollbar sizes when drawing
    
    bnc#619772 leads to a crash because maximum = minimum = 0, and this
    strange (but for whatever reason needed) '- mnVisibleSize' hack
    makes maximum be -1, eventually leading to a crash

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 1689b28..fb8b3b9 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -441,6 +441,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
             //setup parameters from the OO values
             option.minimum = sbVal->mnMin;
             option.maximum = sbVal->mnMax - sbVal->mnVisibleSize;
+            option.maximum = qMax( option.maximum, option.minimum ); // bnc#619772
             option.sliderValue = sbVal->mnCur;
             option.sliderPosition = sbVal->mnCur;
             option.pageStep = sbVal->mnVisibleSize;


More information about the Libreoffice-commits mailing list