diff options
Diffstat (limited to 'desktop/util')
| -rw-r--r-- | desktop/util/ooverinfo.rc | 55 | ||||
| -rw-r--r-- | desktop/util/ooverinfo2.rc | 7 | ||||
| -rw-r--r-- | desktop/util/verinfo.rc | 64 |
3 files changed, 10 insertions, 116 deletions
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc index 06c8d2218ea1..0e9f01ddc317 100644 --- a/desktop/util/ooverinfo.rc +++ b/desktop/util/ooverinfo.rc @@ -6,9 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ooverinfo.rc,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -28,55 +25,14 @@ * *************************************************************************/ -#define VERSION 3 -#define SUBVERSION 1 -//#define VERVARIANT 0 -// .0 + VER_CONCEPT -// .100 + VER_ALPHA -// .200 + VER_BETA -// .300 + VER_GAMMA -// .500 + VER_FINAL -//#define VER_CONCEPT 0 -//#define VER_BETA 6 -#define VER_FINAL 0 - -#define VER_DAY 1 -#define VER_MONTH 4 -#define VER_YEAR 09 - -// ----------------------------------------------------------------------- - #if !defined(ENGLISH) #define LG_D // generate always german version #endif -#define VER_FIRSTYEAR 00 +#define VER_FIRSTYEAR 2000 #include <windows.h> -#include "verinfo.hrc" - -#ifdef WIN32 -#define FOR_WIN_X " (32 Bit)" -#else -#define FOR_WIN_X "" -#endif - -// ----------------------------------------------------------------------- -// language/character set specification table -// ----------------------------------------------------------------------- - -RCD_LANGUAGE rcdata -{ -#ifdef LG_D - "040704B0", // Germany -> Unicode - "040704E4", // Germany -> Windows, Multilingual -#else - "040904B0", // Germany -> Unicode - "040904E4", // USA -> Windows, Multilingual -#endif - "04090000", // USA -> 7-Bit-ASCII - 0 // end of table -} +#include "version.hrc" // ----------------------------------------------------------------------- // version information @@ -140,13 +96,6 @@ VS_VERSION_INFO versioninfo } } -// version binary entry -VS_VERSION_INFO rcdata -{ - 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, - VERSION, SUBVERSION, VERVARIANT, VER_COUNT -}; - 2 ICON "icons\\ooo3_writer_doc.ico" 3 ICON "icons\\ooo3_writer_tem.ico" diff --git a/desktop/util/ooverinfo2.rc b/desktop/util/ooverinfo2.rc index 403e0fae72cd..27fb7ae5c1d0 100644 --- a/desktop/util/ooverinfo2.rc +++ b/desktop/util/ooverinfo2.rc @@ -6,9 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: ooverinfo2.rc,v $ - * $Revision: 1.5 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -29,7 +26,7 @@ *************************************************************************/ #define VERSION 3 -#define SUBVERSION 1 +#define SUBVERSION 2 //#define VERVARIANT 0 // .0 + VER_CONCEPT // .100 + VER_ALPHA @@ -41,7 +38,7 @@ #define VER_FINAL 0 #define VER_DAY 1 -#define VER_MONTH 4 +#define VER_MONTH 9 #define VER_YEAR 2009 // ----------------------------------------------------------------------- diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc index 1588a710e3f9..8f1840afbed9 100644 --- a/desktop/util/verinfo.rc +++ b/desktop/util/verinfo.rc @@ -6,9 +6,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: verinfo.rc,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -28,55 +25,14 @@ * *************************************************************************/ -#define VERSION 9 -//#define SUBVERSION 1 -//#define VERVARIANT 0 -// .0 + VER_CONCEPT -// .100 + VER_ALPHA -// .200 + VER_BETA -// .300 + VER_GAMMA -// .500 + VER_FINAL -//#define VER_CONCEPT 0 -//#define VER_BETA 6 -#define VER_FINAL 0 - -#define VER_DAY 1 -#define VER_MONTH 4 -#define VER_YEAR 2009 - -// ----------------------------------------------------------------------- - #if !defined(ENGLISH) #define LG_D // generate always german version #endif -#define VER_FIRSTYEAR VER_YEAR +#define VER_FIRSTYEAR 2007 #include <windows.h> -#include "verinfo.hrc" - -#ifdef WIN32 -#define FOR_WIN_X " (32 Bit)" -#else -#define FOR_WIN_X "" -#endif - -// ----------------------------------------------------------------------- -// language/character set specification table -// ----------------------------------------------------------------------- - -RCD_LANGUAGE rcdata -{ -#ifdef LG_D - "040704B0", // Germany -> Unicode - "040704E4", // Germany -> Windows, Multilingual -#else - "040904B0", // Germany -> Unicode - "040904E4", // USA -> Windows, Multilingual -#endif - "04090000", // USA -> 7-Bit-ASCII - 0 // end of table -} +#include "version_so.hrc" // ----------------------------------------------------------------------- // version information @@ -84,11 +40,11 @@ RCD_LANGUAGE rcdata VS_VERSION_INFO versioninfo #ifndef SUBVERSION - fileversion VERSION, 0, 0, VERVARIANT - productversion VERSION, 0, 0, VERVARIANT + fileversion VERSION, 0, VERVARIANT, VER_COUNT + productversion VERSION, 0, VERVARIANT, VER_COUNT #else - fileversion VERSION, VERVARIANT, VER_COUNT - productversion VERSION, VERVARIANT, VER_COUNT + fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT + productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT #endif fileflagsmask 0x3F fileflags @@ -145,14 +101,6 @@ VS_VERSION_INFO versioninfo } } -// version binary entry -VS_VERSION_INFO rcdata -{ - 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY, - VERSION, VERVARIANT, VER_COUNT -}; - - 2 ICON "icons\\so9_writer_doc.ico" 3 ICON "icons\\so9_writer_tem.ico" 4 ICON "icons\\so9_calc_doc.ico" |