[Libreoffice-commits] .: 2 commits - desktop/util desktop/win32 solenv/inc
Andras Timar
timar at kemper.freedesktop.org
Fri Jan 6 09:30:52 PST 2012
desktop/util/officeloader.rc | 65 ++++++++++++-------------
desktop/win32/source/applauncher/launcher.rc | 64 ++++++++++++-------------
solenv/inc/shlinfo.rc | 68 +++++++++++++--------------
3 files changed, 95 insertions(+), 102 deletions(-)
New commits:
commit 53faaceac6916d0d35386b7cedd75b8d2171e6ef
Author: Andras Timar <atimar at suse.com>
Date: Fri Jan 6 18:28:41 2012 +0100
remove unused VER_FIRSTYEAR
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index 1e00af6..69710f2 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -25,8 +25,6 @@
*
*************************************************************************/
-#define VER_FIRSTYEAR 2000
-
#include <windows.h>
#include "version.hrc"
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index 04dbe9f..3857d62 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -25,8 +25,6 @@
*
*************************************************************************/
-#define VER_FIRSTYEAR 2009
-
#include <windows.h>
#include "version.hrc"
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 1fca687..2176bbf 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -25,8 +25,6 @@
*
************************************************************************/
-#define VER_FIRSTYEAR 2010
-
#include <windows.h>
#include "version.hrc"
commit 19eaa578790c6b7c72838353954d1e8f7b26fb3e
Author: Andras Timar <atimar at suse.com>
Date: Fri Jan 6 18:27:25 2012 +0100
tabs to spaces
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index b6e2687..1e00af6 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -25,51 +25,51 @@
*
*************************************************************************/
-#define VER_FIRSTYEAR 2000
+#define VER_FIRSTYEAR 2000
#include <windows.h>
#include "version.hrc"
// -----------------------------------------------------------------------
-// version information
+// version information
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- FILEFLAGSMASK 0x3F
- FILEFLAGS
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ FILEFLAGSMASK 0x3F
+ FILEFLAGS
#if defined(DEBUG)
- VS_FF_DEBUG |
+ VS_FF_DEBUG |
#endif
#ifdef VER_PREL
- VS_FF_PRERELEASE |
+ VS_FF_PRERELEASE |
#endif
- 0
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- {
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- // International StringTable
- VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- VALUE "FileVersion", PPS(VER_LEVEL) "\0"
- VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
- VALUE "ProductName", "LibreOffice\0"
- VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
- VALUE "InternalName", PPS(RES_APP_NAME) "\0"
- VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
- }
- }
+ 0
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ {
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ // International StringTable
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductName", "LibreOffice\0"
+ VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
+ VALUE "InternalName", PPS(RES_APP_NAME) "\0"
+ VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
+ }
+ }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x0409, 1252
- }
- }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x0409, 1252
+ }
+ }
1 ICON PPS(RES_APP_ICON)
2 ICON "icons/oasis-text.ico"
@@ -111,4 +111,3 @@ VS_VERSION_INFO VERSIONINFO
38 ICON "icons/database.ico"
39 ICON "icons/formula.ico"
40 ICON "icons/oxt-extension.ico"
-
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index b7c84b1..04dbe9f 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -25,50 +25,50 @@
*
*************************************************************************/
-#define VER_FIRSTYEAR 2009
+#define VER_FIRSTYEAR 2009
#include <windows.h>
#include "version.hrc"
// -----------------------------------------------------------------------
-// version information
+// version information
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- FILEFLAGSMASK 0x3F
- FILEFLAGS
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ FILEFLAGSMASK 0x3F
+ FILEFLAGS
#if defined(DEBUG)
- VS_FF_DEBUG |
+ VS_FF_DEBUG |
#endif
#ifdef VER_PREL
- VS_FF_PRERELEASE |
+ VS_FF_PRERELEASE |
#endif
- 0
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- {
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- // International StringTable
- VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- VALUE "FileVersion", PPS(VER_LEVEL) "\0"
- VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
- VALUE "ProductName", "LibreOffice\0"
- VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
- VALUE "InternalName", PPS(RES_APP_NAME) "\0"
- VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
- }
- }
+ 0
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ {
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ // International StringTable
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
+ VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductName", "LibreOffice\0"
+ VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
+ VALUE "InternalName", PPS(RES_APP_NAME) "\0"
+ VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
+ }
+ }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x0409, 1252
- }
- }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x0409, 1252
+ }
+ }
1 ICON PPS(RES_APP_ICON)
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 2b1398d..1fca687 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -25,50 +25,50 @@
*
************************************************************************/
-#define VER_FIRSTYEAR 2010
+#define VER_FIRSTYEAR 2010
#include <windows.h>
#include "version.hrc"
// -----------------------------------------------------------------------
-// version information
+// version information
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
- FILEFLAGSMASK 0x3F
- FILEFLAGS
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ FILEFLAGSMASK 0x3F
+ FILEFLAGS
#if defined(DEBUG)
- VS_FF_DEBUG |
+ VS_FF_DEBUG |
#endif
#ifdef VER_PREL
- VS_FF_PRERELEASE |
+ VS_FF_PRERELEASE |
#endif
- 0
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_APP
- {
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- // International StringTable
- VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "ProductName", "LibreOffice\0"
- VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
- VALUE "FileVersion", PPS(VER_LEVEL) "\0"
- VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
- VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
- VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
- ADDITIONAL_VERINFO1
- ADDITIONAL_VERINFO2
- ADDITIONAL_VERINFO3
- }
- }
+ 0
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
+ {
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ // International StringTable
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
+ VALUE "ProductName", "LibreOffice\0"
+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
+ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
+ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
+ ADDITIONAL_VERINFO1
+ ADDITIONAL_VERINFO2
+ ADDITIONAL_VERINFO3
+ }
+ }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x0409, 1252
- }
- }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x0409, 1252
+ }
+ }
More information about the Libreoffice-commits
mailing list