extensions/WinResTarget_npsoplugin.mk | 5 +++++
extensions/source/nsplugin/source/nsplugin_oo.rc | 8 +++-----
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 4c8ca04dbe9fd213a3d16a2b5b828cd9a8843f99
Author: Andras Timar <ati...@suse.com>
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 9db0984..9da0038 100644
--- a/extensions/WinResTarget_npsoplugin.mk
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -30,6 +30,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 shiftwidth=4 softtabstop=4 expandtab:
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 76e30059e875bb7905206b45e50b691e68483ea4
Author: Andras Timar <ati...@suse.com>
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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
