[Libreoffice-commits] .: 4 commits - cpputools/Executable_regcomp.mk cpputools/Executable_regsingleton.mk cpputools/Executable_uno.mk framework/source vcl/android vcl/inc vcl/Library_vcl.mk

[Tor Lillqvist]

 cpputools/Executable_regcomp.mk               |    1 +
 cpputools/Executable_regsingleton.mk          |    1 +
 cpputools/Executable_uno.mk                   |    1 +
 framework/source/uielement/toolbarmanager.cxx |   20 +++++++++++++++++++-
 vcl/Library_vcl.mk                            |    1 -
 vcl/android/androidinst.cxx                   |   10 ----------
 vcl/inc/android/androidinst.hxx               |    5 -----
 7 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit 3bc628b9c9f07dd6def2fff365233e9be4b9158c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Apr 11 20:20:08 2012 +0300

    Link the executables with gb_STDLIBS

diff --git a/cpputools/Executable_regcomp.mk b/cpputools/Executable_regcomp.mk
index 1c0dc12..75653d0 100644
--- a/cpputools/Executable_regcomp.mk
+++ b/cpputools/Executable_regcomp.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regcomp,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,regcomp,\
diff --git a/cpputools/Executable_regsingleton.mk b/cpputools/Executable_regsingleton.mk
index eb919da..0bc2a39 100644
--- a/cpputools/Executable_regsingleton.mk
+++ b/cpputools/Executable_regsingleton.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Executable_use_libraries,regsingleton,\
     cppu \
     cppuhelper \
     sal \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,regsingleton,\
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
index b54f18b..252de3f 100644
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Executable_use_libraries,uno,\
     cppuhelper \
     sal \
     salhelper \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_use_externals,uno,\
commit 63c95085db6ecf6254e3f73d8483006ad3e52222
Author: Iain Billett <iainbillett at gmail.com>
Date:   Wed Apr 11 18:36:00 2012 +0300

    fdo#38276: Improve the ">>" toolbar overflow menu

diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 80adbd7..cc874b6 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1880,7 +1880,25 @@ IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar )
     if ( m_bDisposed )
         return 1;
     //modify for i33668 by shizhoubo:2008:04
-    GetToolBarCustomMenu(pToolBar);
+    PopupMenu * pMenu = GetToolBarCustomMenu(pToolBar);
+    if (pMenu)
+    {
+        sal_uInt16 nObsoleteItems = 6;
+        sal_uInt16 positionInMenu;
+        sal_uInt32 obsoleteItems[]  = {  MENUITEM_TOOLBAR_CLOSE ,
+                                     MENUITEM_TOOLBAR_VISIBLEBUTTON ,
+                                     MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR,
+                                     MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION,
+                                     MENUITEM_TOOLBAR_DOCKTOOLBAR,
+                                     MENUITEM_TOOLBAR_DOCKALLTOOLBAR
+                                   };
+        for( int i = 0 ; i < nObsoleteItems ; i++ )
+        {
+            positionInMenu = pMenu->GetItemPos( obsoleteItems[i] );
+            if ( positionInMenu != MENU_ITEM_NOTFOUND )
+                pMenu->RemoveItem( positionInMenu );
+        }
+    }
     //end
      return 0;
  }
commit adef30c0b8d9c5404f37cb9ae3b16040cb4dded7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Apr 10 21:48:31 2012 +0300

    Drop unused EGL stuff

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 9020a67..7194420 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -478,7 +478,6 @@ ifeq ($(GUIBASE),android)
 $(eval $(call gb_Library_add_libs,vcl,\
 	-llog \
 	-landroid \
-	-lEGL -lGLESv1_CM \
 	-llo-bootstrap \
 ))
 $(eval $(call gb_Library_add_defs,vcl,\
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index ffb9ab4..53d197c 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -564,9 +564,6 @@ AndroidSalInstance::AndroidSalInstance( SalYieldMutex *pMutex )
     : SvpSalInstance( pMutex )
     , mpApp( NULL )
     , mbQueueReDraw( false )
-    , mxDisplay( EGL_NO_DISPLAY )
-    , mxSurface( EGL_NO_SURFACE )
-    , mxContext( EGL_NO_CONTEXT )
 {
     mpApp = lo_get_app();
     fprintf (stderr, "created Android Sal Instance for app %p window %p thread: %d\n",
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index 9f8d22f..addec80 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -71,11 +71,6 @@ protected:
     struct android_app *mpApp;
     Region maRedrawRegion;
     bool   mbQueueReDraw;
-
-private:
-    EGLDisplay mxDisplay;
-    EGLSurface mxSurface;
-    EGLContext mxContext;
 };
 
 #endif // ANDROID_SALINST_H
commit 7a77147e66fdd348d949b711f8d8871f1110be33
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Tue Apr 10 21:44:19 2012 +0300

    Drop plasma_now()

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 014b1e3..ffb9ab4 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -37,13 +37,6 @@
 #include <rtl/strbuf.hxx>
 #include <basebmp/scanlineformats.hxx>
 
-extern void VCL_DLLPUBLIC plasma_now(const char *msg);
-
-void plasma_now(const char *msg)
-{
-    fprintf (stderr, "Skipped plasma '%s' !\n", msg);
-}
-
 class AndroidSalData : public SalGenericData
 {
 public: