Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3748

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3748/1

remove defines from npsoplugin resource, that are defined elsewhere

Change-Id: I745944202a25a348f36e79d28f03740a28b70eee
---
M extensions/WinResTarget_npsoplugin.mk
M extensions/source/nsplugin/source/nsplugin_oo.rc
2 files changed, 5 insertions(+), 2 deletions(-)



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>

-- 
To view, visit https://gerrit.libreoffice.org/3748
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I745944202a25a348f36e79d28f03740a28b70eee
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar@suse.com>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.