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

[Petr Mladek]

 patches/dev300/apply                  |    2 --
 patches/dev300/framework-netbook.diff |   21 ---------------------
 2 files changed, 23 deletions(-)

New commits:
commit 039fff78e41cab2d1eb9d68f5eac7c1c99ae2e4b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 14 21:33:44 2011 +0200

    bin obsolete framework-netbook.diff
    
    the change already has been done in git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9af4366..f4cea10 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1522,8 +1522,6 @@ calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
 [ Netbook ]
 vcl-netbook.diff, rodo
 
-framework-netbook.diff, rodo
-
 vcl-netbook-export-small-screen-mode.diff, rodo
 
 framework-netbook-use-small-screen-mode.diff, rodo
diff --git a/patches/dev300/framework-netbook.diff b/patches/dev300/framework-netbook.diff
deleted file mode 100644
index 33c4e76..0000000
--- a/patches/dev300/framework-netbook.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- framework/source/layoutmanager/layoutmanager.cxx |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/layoutmanager.cxx
-index 1b0cd57..6889d13 100644
---- framework/source/layoutmanager/layoutmanager.cxx
-+++ framework/source/layoutmanager/layoutmanager.cxx
-@@ -6141,7 +6141,8 @@ void LayoutManager::implts_updateMenuBarClose()
-             if ( pMenuBar )
-             {
-                 // TODO remove link on FALSE ?!
--                if ( bShowCloser )
-+          // TODO: override only when we are in small screen mode to not modify old behaviour
-+          if ( TRUE /*bShowCloser*/ )
-                 {
-                     pMenuBar->ShowCloser( TRUE );
-                     pMenuBar->SetCloserHdl( LINK( this, LayoutManager, MenuBarClose ));
--- 
-1.7.0.1
-