From d7c43c9580a226008261e2b2f80a3f5c923a388c Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 25 Mar 2010 17:21:13 +0100 Subject: cws l10ntooling18: #i110394# Introduce the variable %OOOVENDOR --- desktop/source/app/app.cxx | 17 +++++++++++++++++ desktop/source/deployment/gui/dp_gui_service.cxx | 9 +++++++++ officecfg/registry/data/org/openoffice/Setup.xcu | 4 ++++ officecfg/registry/schema/org/openoffice/Setup.xcs | 10 +++++++++- svx/source/intro/makefile.mk | 4 ++++ svx/source/intro/ooo.src | 2 +- 6 files changed, 44 insertions(+), 2 deletions(-) diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 53778534c750..cf48ede8cd8a 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -359,6 +359,8 @@ namespace : public rtl::Static< String, Version > {}; struct AboutBoxVersion : public rtl::Static< String, AboutBoxVersion > {}; + struct OOOVendor + : public rtl::Static< String, OOOVendor > {}; struct Extension : public rtl::Static< String, Extension > {}; struct XMLFileFormatName @@ -422,6 +424,21 @@ void ReplaceStringHookProc( UniString& rStr ) rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATVERSION", rXMLFileFormatVersion ); } + if ( rStr.SearchAscii( "%OOOVENDOR" ) != STRING_NOTFOUND ) + { + String &rOOOVendor = OOOVendor::get(); + + if ( !rOOOVendor.Len() ) + { + rtl::OUString aTmp; + Any aRet = ::utl::ConfigManager::GetDirectConfigProperty( + ::utl::ConfigManager::OOOVENDOR ); + aRet >>= aTmp; + rOOOVendor = aTmp; + + } + rStr.SearchAndReplaceAllAscii( "%OOOVENDOR" ,rOOOVendor ); + } if ( rStr.SearchAscii( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != STRING_NOTFOUND ) { diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 061988d5b04d..a6d3ee21c698 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -92,6 +92,8 @@ namespace : public rtl::Static< String, Version > {}; struct AboutBoxVersion : public rtl::Static< String, AboutBoxVersion > {}; + struct OOOVendor + : public rtl::Static< String, OOOVendor > {}; struct Extension : public rtl::Static< String, Extension > {}; } @@ -107,6 +109,7 @@ void ReplaceProductNameHookProc( String& rStr ) String &rVersion = Version::get(); String &rAboutBoxVersion = AboutBoxVersion::get(); String &rExtension = Extension::get(); + String &rOOOVendor = OOOVendor::get(); if ( !rProductName.Len() ) { @@ -121,8 +124,13 @@ void ReplaceProductNameHookProc( String& rStr ) aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::ABOUTBOXPRODUCTVERSION ); aRet >>= aTmp; + rOOOVendor = aTmp; + + aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::OOOVENDOR ); + aRet >>= aTmp; rAboutBoxVersion = aTmp; + if ( !rExtension.Len() ) { aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTEXTENSION ); @@ -135,6 +143,7 @@ void ReplaceProductNameHookProc( String& rStr ) rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion ); rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion ); + rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor ); rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension ); } } diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 4acf93dee764..feb0477503ab 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -37,6 +37,10 @@ ${ABOUTBOXPRODUCTVERSION} + + ${OOOVENDOR} + + ${PRODUCTEXTENSION} diff --git a/officecfg/registry/schema/org/openoffice/Setup.xcs b/officecfg/registry/schema/org/openoffice/Setup.xcs index 9e5551bda18a..2b21de7afe47 100644 --- a/officecfg/registry/schema/org/openoffice/Setup.xcs +++ b/officecfg/registry/schema/org/openoffice/Setup.xcs @@ -241,7 +241,15 @@ - + + + IHI + Specifies the vendor who build the product. + + + + + Specifies the version number that appears on the user interface. diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk index 3ed86b3bcda3..9399514c3631 100644 --- a/svx/source/intro/makefile.mk +++ b/svx/source/intro/makefile.mk @@ -40,6 +40,10 @@ RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES OOO_VENDOR*=$(USER)$(USERNAME) RSCDEFS+=-DOOO_VENDOR="$(OOO_VENDOR)" +.IF "x$(OOO_VENDOR)x" == "xx" +.EXPORT : OOO_VENDOR +.ENDIF + # --- Allgemein ----------------------------------------------------------- LOCALIZE_ME=intro_tmpl.hrc diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src index 6c52a054e3ce..f638120a507d 100644 --- a/svx/source/intro/ooo.src +++ b/svx/source/intro/ooo.src @@ -86,7 +86,7 @@ ModalDialog RID_DEFAULTABOUT { Pos = MAP_APPFONT ( 54 , 25 ) ; Size = MAP_APPFONT ( 168 , 51 ) ; - Text[ en-US ] ="Copyright 2000-2009 Sun Microsystems Inc.\nThis product was created by " OOO_VENDOR ", based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html."; + Text[ en-US ] ="Copyright 2000-2009 Sun Microsystems Inc.\nThis product was created by %OOOVENDOR, based on OpenOffice.org.\nOpenOffice.org acknowledges all community members, especially those mentioned at http://www.openoffice.org/welcome/credits.html."; WordBreak = TRUE ; }; StringArray ABOUT_STR_DEVELOPER_ARY -- cgit From 78d5c55e026562260b0ed0b46d656e11dfbe40fa Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 25 Mar 2010 17:28:17 +0100 Subject: cws l10ntooling18: #i110394# OOO_VENDOR is no longer merged by rsc but by config --- svx/source/intro/makefile.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk index 9399514c3631..4d0686baac04 100644 --- a/svx/source/intro/makefile.mk +++ b/svx/source/intro/makefile.mk @@ -36,14 +36,6 @@ TARGET=intro RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES -# setting the compiled by $user$ string in the About box -OOO_VENDOR*=$(USER)$(USERNAME) -RSCDEFS+=-DOOO_VENDOR="$(OOO_VENDOR)" - -.IF "x$(OOO_VENDOR)x" == "xx" -.EXPORT : OOO_VENDOR -.ENDIF - # --- Allgemein ----------------------------------------------------------- LOCALIZE_ME=intro_tmpl.hrc -- cgit From 63c588143c71a72636b1e436aa231f9303efcacc Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 25 Mar 2010 18:24:49 +0100 Subject: cws l10ntooling18: #i110394# confused assignment --- desktop/source/deployment/gui/dp_gui_service.cxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index a6d3ee21c698..578ff04a6c88 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -124,12 +124,11 @@ void ReplaceProductNameHookProc( String& rStr ) aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::ABOUTBOXPRODUCTVERSION ); aRet >>= aTmp; - rOOOVendor = aTmp; + rAboutBoxVersion = aTmp; aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::OOOVENDOR ); aRet >>= aTmp; - rAboutBoxVersion = aTmp; - + rOOOVendor = aTmp; if ( !rExtension.Len() ) { -- cgit