[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - toolkit/source

Lionel Elie Mamane lionel at mamane.lu
Wed Jun 4 00:32:45 PDT 2014


 toolkit/source/awt/vclxwindows.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1fd9e8e1bdf1ddf32b21d12e3793cb7a2c53e1a1
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu May 29 08:09:57 2014 +0200

    fdo#75364 flat style and 3d style were swapped
    
    Change-Id: I929f8f63e8017727595be30f4e56f3aabeec2b1e
    Reviewed-on: https://gerrit.libreoffice.org/9553
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 84e0f66..601ef8b 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -175,11 +175,11 @@ namespace toolkit
         switch ( nStyle )
         {
         case FLAT:
-            aStyleSettings.SetOptions( aStyleSettings.GetOptions() & ~STYLE_OPTION_MONO );
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
             break;
         case LOOK3D:
         default:
-            aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() & ~STYLE_OPTION_MONO );
         }
         aSettings.SetStyleSettings( aStyleSettings );
         _pWindow->SetSettings( aSettings );


More information about the Libreoffice-commits mailing list