[Libreoffice-commits] .: 2 commits - crashrep/source desktop/util desktop/win32 solenv/inc

[Andras Timar]

 crashrep/source/win32/rcheader.txt           |    4 ++--
 desktop/util/officeloader.rc                 |    2 +-
 desktop/win32/source/applauncher/launcher.rc |    2 +-
 solenv/inc/shlinfo.rc                        |    2 +-
 solenv/inc/version.hrc                       |    6 ------
 5 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 734bfe16bdfe7c80fa8c0c71d680746353686961
Author: Andras Timar <atimar at suse.com>
Date:   Tue Nov 22 14:13:35 2011 +0100

    remove unused FOR_WIN_X define

diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 74dd722..41afa55 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -37,12 +37,6 @@
 
 #include "verinfo.hrc"
 
-#ifdef WIN32
-#define FOR_WIN_X " (32 Bit)"
-#else
-#define FOR_WIN_X ""
-#endif
-
 // -----------------------------------------------------------------------
 //                  language/character set specification table
 // -----------------------------------------------------------------------
commit 018b48d36192c49ce9a39745d110b38ccf8bfa97
Author: Andras Timar <atimar at suse.com>
Date:   Tue Nov 22 14:10:56 2011 +0100

    fix VERSIONINFO section of win32 executables fdo#30798

diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt
index 22821e5..0bf2cd4 100755
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -73,13 +73,13 @@ VS_VERSION_INFO versioninfo
 			block "040904E4"
 			{
 				// International StringTable
-				value "CompanyName", 		"OpenOffice.org\0"
+				value "CompanyName", 		"The Document Foundation\0"
 				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "ProductVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	"SOREPORT.EXE\0"
 				value "InternalName", 		"CrashReport\0"
-				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
 			}
 		}
 
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index 4c4fc6a..fb25b7d 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -60,7 +60,7 @@ VS_VERSION_INFO VERSIONINFO
 				VALUE "ProductVersion",		PPS(VER_LEVEL) "\0"
 				VALUE "OriginalFilename",	"SOFFICE.EXE\0"
 				VALUE "InternalName", 		"SOFFICE\0"
-				VALUE "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
+				VALUE "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
 			}
 		}
 
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index 1ca6fc6..f9da5cc 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -60,7 +60,7 @@ VS_VERSION_INFO VERSIONINFO
 				VALUE "ProductVersion",		PPS(VER_LEVEL) "\0"
 				VALUE "OriginalFilename",	PPS(RES_APP_NAME) ".exe\0"
 				VALUE "InternalName",		PPS(RES_APP_NAME) "\0"
-				VALUE "LegalCopyright", 	S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0"
+				VALUE "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
 			}
 		}
 
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 5896f2b..1c50943 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -63,7 +63,7 @@ VS_VERSION_INFO VERSIONINFO
 				VALUE "FileVersion",		PPS(VER_LEVEL) "\0"
 				VALUE "OriginalFilename",	PPS(ORG_NAME) "\0"
 				VALUE "InternalName", 		PPS(INTERNAL_NAME) "\0"
-                VALUE "LegalCopyright", 	S_CRIGHT " The Document Foundation\0"
+                VALUE "LegalCopyright", 	S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3