[Libreoffice-commits] .: solenv/inc

[Andras Timar]

 solenv/inc/shlinfo.rc     |   27 ---------------------------
 solenv/inc/verinfo.hrc    |   40 ++++++----------------------------------
 solenv/inc/version.hrc    |    7 +------
 solenv/inc/version_so.hrc |    7 +------
 4 files changed, 8 insertions(+), 73 deletions(-)

New commits:
commit cb04c26fe536190382cc20492080ea7795c7f9c8
Author: Andras Timar <timar at fsf.hu>
Date:   Tue Oct 12 13:48:17 2010 +0200

    removed German from the versioninfo

diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 9a2a3c1..2a43b0f 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -25,10 +25,6 @@
  *
  ************************************************************************/
 
-#if !defined(ENGLISH)
-#define LG_D 					// generate always german version
-#endif
-
 #define VER_FIRSTYEAR	2010
 
 
@@ -62,29 +58,11 @@ VS_VERSION_INFO versioninfo
 	VS_FF_PRERELEASE |
 #endif
 	0
-#ifndef WIN32
-	fileos VOS_DOS_WINDOWS16
-#else
 	fileos VOS_NT_WINDOWS32
-#endif
 	filetype VFT_APP
 	{
 		block "StringFileInfo"
 		{
-#ifdef LG_D
-			block "040704E4"
-			{
-				// German StringTable
-                value "CompanyName",		"The Document Foundation\0"
-				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"
-				ADDITIONAL_VERINFO1
-				ADDITIONAL_VERINFO2
-				ADDITIONAL_VERINFO3
-			}
-#else
 			block "040904E4"
 			{
 				// International StringTable
@@ -97,16 +75,11 @@ VS_VERSION_INFO versioninfo
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
 			}
-#endif
 		}
 
 		block "VarFileInfo"
 		{
-#ifdef LG_D
-			value "Translation", 0x0407, 1252
-#else
 			value "Translation", 0x0409, 1252
-#endif
 		}
 	}
 
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
index 02457bf..5af626c 100644
--- a/solenv/inc/verinfo.hrc
+++ b/solenv/inc/verinfo.hrc
@@ -54,11 +54,7 @@
 
 // define order of date parts --------------------------------------------
 
-#if defined(LG_D)
-  #define VER_DMY
-#else
-  #define VER_YMD
-#endif
+#define VER_YMD
 
 // set VERVARIANT to 0 if not defined ------------------------------------
 
@@ -158,19 +154,11 @@
 #elif VER_MONTH==2
   #define VER2 Feb
 #elif VER_MONTH==3
-  #ifdef LG_D
-    #define VER2 M\344r
-  #else
-    #define VER2 Mar
-  #endif
+  #define VER2 Mar
 #elif VER_MONTH==4
   #define VER2 Apr
 #elif VER_MONTH==5
-  #ifdef LG_D
-    #define VER2 Mai
-  #else
-    #define VER2 May
-  #endif
+  #define VER2 May
 #elif VER_MONTH==6
   #define VER2 Jun
 #elif VER_MONTH==7
@@ -180,26 +168,14 @@
 #elif VER_MONTH==9
   #define VER2 Sep
 #elif VER_MONTH==10
-  #ifdef LG_D
-    #define VER2 Okt
-  #else
-    #define VER2 Oct
-  #endif
+  #define VER2 Oct
 #elif VER_MONTH==11
   #define VER2 Nov
 #elif VER_MONTH==12
-  #ifdef LG_D
-    #define VER2 Dez
-  #else
-    #define VER2 Dec
-  #endif
+  #define VER2 Dec
 #endif
 
-#ifdef LG_D
-  #define VERC3(a, b, c) a.b.c
-#else
-  #define VERC3(a, b, c) c-b-a
-#endif
+#define VERC3(a, b, c) c-b-a
 #define VERC4(a, b, c) VERC3(a, b, c)
 #define VER_DATE VERC4(VER5, VER2, VER_YEAR)
 
@@ -219,11 +195,7 @@
 
 #define S_CRIGHT PPS(VERC6(VER_YEARRANGE))
 
-#ifdef LG_D
-#define S_VERSION PPS(Version VER_LEVEL vom VER_DATE)
-#else
 #define S_VERSION PPS(Version VER_LEVEL of VER_DATE)
-#endif
 
 #endif	// _VERINFO_HRC
 
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 1abf729..c098be0 100755
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -59,13 +59,8 @@
 
 RCD_LANGUAGE rcdata
 {
-#ifdef LG_D
-    "040704B0",     // Germany -> Unicode
-    "040704E4",     // Germany -> Windows, Multilingual
-#else
-    "040904B0",     // Germany -> Unicode
+    "040904B0",     // USA -> Unicode
     "040904E4",     // USA -> Windows, Multilingual
-#endif
     "04090000",     // USA -> 7-Bit-ASCII
     0               // end of table
 }
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 5e2c35b..b7e9539 100755
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -59,13 +59,8 @@
 
 RCD_LANGUAGE rcdata
 {
-#ifdef LG_D
-    "040704B0",     // Germany -> Unicode
-    "040704E4",     // Germany -> Windows, Multilingual
-#else
-    "040904B0",     // Germany -> Unicode
+    "040904B0",     // USA -> Unicode
     "040904E4",     // USA -> Windows, Multilingual
-#endif
     "04090000",     // USA -> 7-Bit-ASCII
     0               // end of table
 }