extensions/Library_npsoplugin.mk | 9 +++------ extensions/WinResTarget_npsoplugin.mk | 9 +++++++-- extensions/source/nsplugin/source/npshell.cxx | 11 +---------- extensions/source/nsplugin/source/nsplugin_oo.rc | 8 +++----- solenv/gbuild/Library.mk | 1 + solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 ++++++ solenv/gbuild/platform/com_MSC_class.mk | 6 ++++++ 7 files changed, 27 insertions(+), 23 deletions(-)
New commits: commit e8177f99008ee24283e0506e296edb59a16ff8d6 Author: Andras Timar <[email protected]> Date: Thu May 2 09:34:34 2013 -0700 remove unsupported binfilter types from npsoplugin Change-Id: Ifd12d4d1f4dab0a6bea4701d0a1b9ab4f3763ce7 diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index fe467b5..2e02004 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -346,16 +346,7 @@ bool sendMsg( PLUGIN_MSG* pMsg, size_t len, int iEnsure) extern "C" { -char* pMimeTypes = const_cast< char* >( "application/vnd.stardivision.calc:sdc:StarCalc 3.0 - 5.0;" -"application/vnd.stardivision.chart:sds:StarChart 3.0 - 5.0;" -"application/vnd.stardivision.draw:sda:StarDraw 3.0 - 5.0;" -"application/vnd.stardivision.impress:sdd:StarImpress 3.0 - 5.0;" -"application/vnd.stardivision.impress-packed:sdp:StarImpress-packed 3.0 - 5.0;" -"application/vnd.stardivision.math:smf:StarMath 3.0 - 5.0;" -"application/vnd.stardivision.writer:vor:StarWriter Template 3.0 - 5.0;" -"application/vnd.stardivision.writer-global:sgl:StarWriter Global 3.0 - 5.0;" -"application/vnd.staroffice.writer:sdw:StarWriter 3.0 - 5.0;" -"application/msword:doc:MS Word document;" +char* pMimeTypes = const_cast< char* >( "application/msword:doc:MS Word document;" "application/msword:dot:MS Word document template;" "application/vnd.ms-excel:xls:MS Excel spreadsheet;" "application/vnd.ms-excel:xlt:MS Excel spreadsheet template;" commit 248eea0629ce2762744cdee5e8266700ff86b0c5 Author: Andras Timar <[email protected]> Date: Thu May 2 08:59:57 2013 -0700 remove defines from npsoplugin resource, that are defined elsewhere Change-Id: I745944202a25a348f36e79d28f03740a28b70eee diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index cc92638..2064de5 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -11,6 +11,11 @@ $(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) +$(eval $(call gb_WinResTarget_add_defs,npsoplugin/npsoplugin,\ + -DVERVARIANT=$(BUILD) \ + -DRES_APP_VENDOR="$(OOO_VENDOR)" \ +)) + $(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set noet sw=4 ts=4: diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index d294836..6284abe 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -28,9 +28,7 @@ VALUE "FileOpenName", "StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" #define ADDITIONAL_VERINFO2 VALUE "FileDescription", "LibreOffice Plug-in handles all its documents" VALUE "ProductName", "LibreOffice Plug-in" VALUE "MIMEType", "application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0" -#define VERVARIANT 3 #define ORG_NAME npsoplugin.dll -#define RES_APP_VENDOR #define INTERNAL_NAME npsoplugin #include <windows.h> commit 3b356ea97710f2234b92802cc898394673518da3 Author: Andras Timar <[email protected]> Date: Thu May 2 08:58:05 2013 -0700 remove unsupported binfilter types from npsoplugin Change-Id: Ifb23e61b265697272e54df225719e006319e79af diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index ba09335..d294836 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -24,9 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#define ADDITIONAL_VERINFO1 VALUE "FileExtents", "sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\ - VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" -#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "LibreOffice Plug-in handles all its documents" VALUE "ProductName", "LibreOffice Plug-in" VALUE "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" +#define ADDITIONAL_VERINFO1 VALUE "FileExtents", "sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0"\ + VALUE "FileOpenName", "StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" +#define ADDITIONAL_VERINFO2 VALUE "FileDescription", "LibreOffice Plug-in handles all its documents" VALUE "ProductName", "LibreOffice Plug-in" VALUE "MIMEType", "application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0" #define VERVARIANT 3 #define ORG_NAME npsoplugin.dll commit ae3f7b70a84f330f76e2e60c4c6bc8c69dbf068f Author: Andras Timar <[email protected]> Date: Thu May 2 08:35:46 2013 -0700 fdo#54087 link the correct resource file to npsoplugin.dll I had to add a new function to gbuild system: set_nativeres, because the trick in extensions/Library_npsoplugin.mk did not work. It linked the default.res, and that made the plugin unusable under Windows. Also, one export was missing compared to LibreOffice 3.5. Conflicts: extensions/Library_npsoplugin.mk extensions/WinResTarget_npsoplugin.mk Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390 diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 9cf30c9..b74d6ba 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -78,6 +78,8 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_GetMIMEDescription \ + /EXPORT:NPP_Initialize \ + /EXPORT:NPP_Shutdown \ /EXPORT:NPP_New \ /EXPORT:NPP_Destroy \ /EXPORT:NPP_SetWindow \ @@ -88,7 +90,6 @@ $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_StreamAsFile \ /EXPORT:NPP_URLNotify \ /EXPORT:NPP_Print \ - /EXPORT:NPP_Shutdown \ /EXPORT:NP_GetEntryPoints \ /EXPORT:NP_Initialize \ /EXPORT:NP_Shutdown \ @@ -96,11 +97,7 @@ $(eval $(call gb_Library_add_ldflags,npsoplugin,\ )) endif -# Trick to get rid of the default.res to avoid duplicate VERSION -# resource: Set NATIVERES for npsoplugin to be *only* nsplugin_oo - -$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,nsplugin_oo)) -$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,nsplugin_oo)) +$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin)) endif # GUI=WNT diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index 30bf3db..cc92638 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -9,8 +9,8 @@ # # -$(eval $(call gb_WinResTarget_WinResTarget,nsplugin_oo)) +$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) -$(eval $(call gb_WinResTarget_set_rcfile,nsplugin_oo,extensions/source/nsplugin/source/nsplugin_oo)) +$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set noet sw=4 ts=4: diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index aa92d85..1795be0 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -265,6 +265,7 @@ $(eval $(foreach method,\ add_precompiled_header \ export_objects_list \ add_nativeres \ + set_nativeres \ set_visibility_default \ set_warnings_not_errors \ set_generated_cxx_suffix \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 29aa4af..77c2218 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -286,6 +286,12 @@ $(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 83d5d45..d101c65 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -357,6 +357,12 @@ $(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
