[Libreoffice-commits] .: 2 commits - extensions/Executable_pluginapp.bin.mk extensions/StaticLibrary_plugcon.mk vcl/unx

[Libreoffice Gerrit user]

 extensions/Executable_pluginapp.bin.mk |    2 --
 extensions/StaticLibrary_plugcon.mk    |   11 ++++++++++-
 vcl/unx/gtk/window/gtksalmenu.cxx      |   10 ++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 1b123a4bd821e1d43c64418652b69a782cd243a2
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Nov 28 17:42:35 2012 +0100

    avoid circular dep between vcl and framework
    
    Change-Id: Ibcb547b2b911d382eafa1fd8a9adb2e8b6efbfe2

diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index d3c20a2..605db0d 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -20,12 +20,14 @@
 #  include <gdk/gdkkeysyms-compat.h>
 #endif
 
-#include <svtools/menuoptions.hxx>
-
-#include <framework/menuconfiguration.hxx>
-
 #include <sal/log.hxx>
 
+// FIXME Copied from framework/inc/framework/menuconfiguration.hxx to
+// avoid circular dependency between modules. It should be in a common
+// header (probably in vcl).
+const sal_uInt16 START_ITEMID_WINDOWLIST    = 4600;
+const sal_uInt16 END_ITEMID_WINDOWLIST      = 4699;
+
 static sal_Bool bMenuVisibility = sal_False;
 
 /*
commit 334a58130bdd4afa0bbc2e65d78f8f5709b0b618
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Nov 25 16:56:54 2012 +0100

    add missing deps for tools/link.hxx
    
    Change-Id: I5e83cd97978ea61c749f1d9be17ec0e9e0809127

diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 43e8ea3..8bfea65 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -30,8 +30,6 @@
 
 $(eval $(call gb_Executable_Executable,pluginapp.bin))
 
-$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc))
-
 $(eval $(call gb_Executable_use_external,pluginapp.bin,npapi_headers))
 
 $(eval $(call gb_Executable_set_include,pluginapp.bin,\
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 663184d..ba94b0b 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -31,7 +31,16 @@ endif
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
 
-$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc))
+$(eval $(call gb_StaticLibrary_use_packages,plugcon,\
+    basegfx_inc \
+    comphelper_inc \
+    cppu_inc \
+    i18npool_inc \
+    np_sdk_inc \
+    tools_inc \
+    unotools_inc \
+    vcl_inc \
+))
 
 $(eval $(call gb_StaticLibrary_use_external,plugcon,npapi_headers))