[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/framework-netbook-use-small-screen-mode.diff |   28 +++---------
 1 file changed, 9 insertions(+), 19 deletions(-)

New commits:
commit b94ed62c199e75a7fa645e348c3d826933ca7c2a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 15 15:21:26 2011 +0200

    fix framework-netbook-use-small-screen-mode.diff to apply

diff --git a/patches/dev300/framework-netbook-use-small-screen-mode.diff b/patches/dev300/framework-netbook-use-small-screen-mode.diff
index 0ab5eea..7a99f74 100644
--- a/patches/dev300/framework-netbook-use-small-screen-mode.diff
+++ b/patches/dev300/framework-netbook-use-small-screen-mode.diff
@@ -1,21 +1,11 @@
----
- framework/source/layoutmanager/layoutmanager.cxx |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/layoutmanager.cxx
-index 6889d13..6887a63 100644
---- framework/source/layoutmanager/layoutmanager.cxx
-+++ framework/source/layoutmanager/layoutmanager.cxx
-@@ -6141,8 +6141,7 @@ void LayoutManager::implts_updateMenuBarClose()
+--- framework/source/layoutmanager/layoutmanager.cxx.old	2011-04-01 13:21:18.000000000 +0200
++++ framework/source/layoutmanager/layoutmanager.cxx	2011-04-15 15:19:27.000000000 +0200
+@@ -2600,7 +2600,7 @@ void LayoutManager::implts_updateMenuBar
              if ( pMenuBar )
              {
-                 // TODO remove link on FALSE ?!
--          // TODO: override only when we are in small screen mode to not modify old behaviour
--          if ( TRUE /*bShowCloser*/ )
-+            if ( pWindow->GetSmallScreenMode() || bShowCloser )
-                 {
-                     pMenuBar->ShowCloser( TRUE );
-                     pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
--- 
-1.7.0.1
-
+                 // TODO remove link on sal_False ?!
+-                pMenuBar->ShowCloser( bShowCloser );
++                pMenuBar->ShowCloser( pWindow->GetSmallScreenMode() || bShowCloser );
+                 pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
+             }
+         }