[Libreoffice-commits] core.git: sw/source

Tor Lillqvist tml at iki.fi
Fri Apr 19 14:01:49 PDT 2013


 sw/source/core/view/viewsh.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cf3e8cf92190baddf601283855070a36fc89125c
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Apr 20 00:00:51 2013 +0300

    WaE: variables set but not used
    
    Can bypass even more lines for OS X, Android and iOS.
    
    Change-Id: I6949ffa0cd21281ba169a813999da4b52e88691e

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index da4ab58..e191798 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1193,6 +1193,9 @@ void ViewShell::VisPortChgd( const SwRect &rRect)
 
 sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect )
 {
+#if !defined(MACOSX) && !defined(ANDROID) && !defined(IOS)
+    // #i98766# - disable smooth scrolling for Mac
+
     const sal_uLong nColCnt = mpOut->GetColorCount();
     long lMult = 1, lMax = LONG_MAX;
     if ( nColCnt == 65536 )
@@ -1211,9 +1214,6 @@ sal_Bool ViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRe
         lMult = 12;
     }
 
-#if !defined(MACOSX) && !defined(ANDROID) && !defined(IOS)
-    // #i98766# - disable smooth scrolling for Mac
-
     // #i75172# isolated static conditions
     const bool bOnlyYScroll(!lXDiff && Abs(lYDiff) != 0 && Abs(lYDiff) < lMax);
     const bool bAllowedWithChildWindows(GetWin()->GetWindowClipRegionPixel(WINDOW_GETCLIPREGION_NOCHILDREN|WINDOW_GETCLIPREGION_NULL).IsNull());


More information about the Libreoffice-commits mailing list