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

[Stephan Bergmann]

 desktop/source/app/app.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 810824d10df45944d223db1efab4b3cb99161e33
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 9 09:49:17 2015 +0100

    vcl/settings.hxx "drag full options API" uses sal_uLong
    
    ...for better or worse
    
    Change-Id: I8069da4a544cb6a69cbcd7243469bc6ea7b112a4

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 59d984d..145c0c1 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1866,7 +1866,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
     StyleSettings hStyleSettings   = rSettings.GetStyleSettings();
     MouseSettings hMouseSettings = rSettings.GetMouseSettings();
 
-    sal_uInt32 nDragFullOptions = hStyleSettings.GetDragFullOptions();
+    sal_uLong nDragFullOptions = hStyleSettings.GetDragFullOptions();
 
     SvtTabAppearanceCfg aAppearanceCfg;
     sal_uInt16 nDragMode = aAppearanceCfg.GetDragMode();
@@ -1876,7 +1876,7 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings )
         nDragFullOptions |= DRAGFULL_OPTION_ALL;
         break;
     case DragFrame:
-        nDragFullOptions &= ((sal_uInt32)~DRAGFULL_OPTION_ALL);
+        nDragFullOptions &= ~DRAGFULL_OPTION_ALL;
         break;
     case DragSystemDep:
     default: