diff options
Diffstat (limited to 'desktop/util')
| -rwxr-xr-x[-rw-r--r--] | desktop/util/hidother.src | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | desktop/util/makefile.mk | 21 | ||||
| -rwxr-xr-x[-rw-r--r--] | desktop/util/ooverinfo.rc | 28 | ||||
| -rwxr-xr-x[-rw-r--r--] | desktop/util/soffice.ico | bin | 4990 -> 4990 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | desktop/util/template.manifest | 4 | ||||
| -rwxr-xr-x | desktop/util/verinfo.rc | 28 |
6 files changed, 5 insertions, 76 deletions
diff --git a/desktop/util/hidother.src b/desktop/util/hidother.src index a7ca7c09874e..a7ca7c09874e 100644..100755 --- a/desktop/util/hidother.src +++ b/desktop/util/hidother.src diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index 8cf03f157254..df2fe688b9fa 100644..100755 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -57,22 +57,9 @@ RCFILES=ooverinfo2.rc LINKFLAGSAPPGUI!:= $(LINKFLAGSAPPGUI:s/-bind_at_load//) .ENDIF # MACOSX -#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" || "$(OS)" == "NETBSD" -## #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, -## winXX is handled like solaris for now -#APP1_STDPRE= -#APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \ -# $(VOSLIB) $(SALLIB) -#.ELSE -#APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \ -# $(CPPUHELPERLIB) -#APP1_STDPOST= -#.ENDIF - RESLIB1NAME= dkt RESLIB1IMAGES= $(PRJ)$/res -RESLIB1SRSFILES= $(SRS)$/desktop.srs \ - $(SRS)$/wizard.srs +RESLIB1SRSFILES= $(SRS)$/desktop.srs .IF "$(L10N_framework)"=="" .IF "$(LINK_SO)"=="TRUE" @@ -91,11 +78,6 @@ APP1VERINFO=verinfo.rc APP1LINKRES=$(MISC)$/$(TARGET)1.res APP1STACK=10000000 -# create a manifest file with the same name as the -#office executable file soffice.exe.manifest -#$(BIN)$/$(TARGET).exe.manifest: template.manifest -#$(COPY) $< $@ - .ENDIF # WNT .ENDIF # "$(GUI)" != "OS2" @@ -109,7 +91,6 @@ APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj APP5STDLIBS = $(SALLIB) $(SOFFICELIB) .IF "$(OS)" == "LINUX" APP5STDLIBS+= -lXext -lX11 -#APP5STDLIBS+= -lXext -lSM -lICE .ENDIF # LINUX APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc index 6d92e2a99500..5412f5fb2f6d 100644..100755 --- a/desktop/util/ooverinfo.rc +++ b/desktop/util/ooverinfo.rc @@ -25,10 +25,6 @@ * *************************************************************************/ -#if !defined(ENGLISH) -#define LG_D // generate always german version -#endif - #define VER_FIRSTYEAR 2000 #include <windows.h> @@ -50,32 +46,15 @@ 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", "OpenOffice.org\0" - value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" - value "FileVersion", PPS(VER_LEVEL) "\0" - value "ProductVersion", PPS(VER_LEVEL) "\0" - value "OriginalFilename", "SOFFICE.EXE\0" - value "InternalName", "SOFFICE\0" - value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0" - } -#else 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" @@ -83,16 +62,11 @@ VS_VERSION_INFO versioninfo value "InternalName", "SOFFICE\0" value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0" } -#endif } block "VarFileInfo" { -#ifdef LG_D - value "Translation", 0x0407, 1252 -#else value "Translation", 0x0409, 1252 -#endif } } diff --git a/desktop/util/soffice.ico b/desktop/util/soffice.ico Binary files differindex 88ccf5e5a6a0..88ccf5e5a6a0 100644..100755 --- a/desktop/util/soffice.ico +++ b/desktop/util/soffice.ico diff --git a/desktop/util/template.manifest b/desktop/util/template.manifest index dbed81ce3f21..d3bd0c101f2f 100644..100755 --- a/desktop/util/template.manifest +++ b/desktop/util/template.manifest @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="OpenOffice" type="win32" /> -<description>http://www.openoffice.org</description> +<assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="LibreOffice" type="win32" /> +<description>http://www.documentfoundation.org</description> <dependency> <dependentAssembly> <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="x86"/> diff --git a/desktop/util/verinfo.rc b/desktop/util/verinfo.rc index 7d589956ec83..7fce1e773a14 100755 --- a/desktop/util/verinfo.rc +++ b/desktop/util/verinfo.rc @@ -25,10 +25,6 @@ * *************************************************************************/ -#if !defined(ENGLISH) -#define LG_D // generate always german version -#endif - #define VER_FIRSTYEAR 2007 #include <windows.h> @@ -55,32 +51,15 @@ 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", "Oracle\0" - value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" - value "FileVersion", PPS(VER_LEVEL) "\0" - value "ProductVersion", PPS(VER_LEVEL) "\0" - value "OriginalFilename", "SOFFICE.EXE\0" - value "InternalName", "SOFFICE\0" - value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0" - } -#else block "040904E4" { // International StringTable - value "CompanyName", "Oracle\0" + value "CompanyName", "The Document Foundation\0" value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0" value "FileVersion", PPS(VER_LEVEL) "\0" value "ProductVersion", PPS(VER_LEVEL) "\0" @@ -88,16 +67,11 @@ VS_VERSION_INFO versioninfo value "InternalName", "SOFFICE\0" value "LegalCopyright", S_CRIGHT " Oracle and/or its affiliates. All rights reserved.\0" } -#endif } block "VarFileInfo" { -#ifdef LG_D - value "Translation", 0x0407, 1252 -#else value "Translation", 0x0409, 1252 -#endif } } |