diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-12-16 14:08:38 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-12-16 14:29:13 +0100 |
| commit | dac89858f63c0f9527f11ad3a6c8b5ea16053c85 (patch) | |
| tree | ef1da3fd7966179c685963acd48f3151487ec865 /desktop | |
| parent | Trying to get the linking with internal zlib right (diff) | |
| download | core-dac89858f63c0f9527f11ad3a6c8b5ea16053c85.tar.gz core-dac89858f63c0f9527f11ad3a6c8b5ea16053c85.zip | |
add version suffix (beta1) to about dialog
configurable at build time via ABOUTBOXPRODUCTVERSIONSUFFIX in
instsetoo_native/util/openoffice.lst
configurable at runtime via registry/data/org/openoffice/Setup.xcu
and ooSetupVersionAboutBoxSuffix property
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_service.cxx | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 61c3832ab04b..49d86b068977 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -274,6 +274,8 @@ namespace : public rtl::Static< String, Version > {}; struct AboutBoxVersion : public rtl::Static< String, AboutBoxVersion > {}; + struct AboutBoxVersionSuffix + : public rtl::Static< String, AboutBoxVersionSuffix > {}; struct OOOVendor : public rtl::Static< String, OOOVendor > {}; struct Extension @@ -296,6 +298,7 @@ void ReplaceStringHookProc( UniString& rStr ) String rBrandName = BrandName::get(); String rVersion = Version::get(); String rAboutBoxVersion = AboutBoxVersion::get(); + String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); String rExtension = Extension::get(); String rXMLFileFormatName = XMLFileFormatName::get(); String rXMLFileFormatVersion = XMLFileFormatVersion::get(); @@ -308,6 +311,7 @@ void ReplaceStringHookProc( UniString& rStr ) utl::ConfigManager::getProductXmlFileFormatVersion(); rVersion = utl::ConfigManager::getProductVersion(); rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion(); + rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix(); if ( !rExtension.Len() ) { rExtension = utl::ConfigManager::getProductExtension(); @@ -317,6 +321,7 @@ void ReplaceStringHookProc( UniString& rStr ) nPro++; rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rBrandName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion ); + rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix ); rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion ); rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension ); rStr.SearchAndReplaceAllAscii( "%PRODUCTXMLFILEFORMATNAME", rXMLFileFormatName ); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 8108e74bda6c..1e98df481455 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 AboutBoxVersionSuffix + : public rtl::Static< String, AboutBoxVersionSuffix > {}; struct OOOVendor : public rtl::Static< String, OOOVendor > {}; struct Extension @@ -108,6 +110,7 @@ void ReplaceProductNameHookProc( String& rStr ) String rProductName = ProductName::get(); String rVersion = Version::get(); String rAboutBoxVersion = AboutBoxVersion::get(); + String rAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); String rExtension = Extension::get(); String rOOOVendor = OOOVendor::get(); @@ -116,6 +119,7 @@ void ReplaceProductNameHookProc( String& rStr ) rProductName = utl::ConfigManager::getProductName(); rVersion = utl::ConfigManager::getProductVersion(); rAboutBoxVersion = utl::ConfigManager::getAboutBoxProductVersion(); + rAboutBoxVersionSuffix = utl::ConfigManager::getAboutBoxProductVersionSuffix(); rOOOVendor = utl::ConfigManager::getVendor(); if ( !rExtension.Len() ) { @@ -126,6 +130,7 @@ void ReplaceProductNameHookProc( String& rStr ) nPro++; rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", rProductName ); rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", rVersion ); + rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSIONSUFFIX", rAboutBoxVersionSuffix ); rStr.SearchAndReplaceAllAscii( "%ABOUTBOXPRODUCTVERSION", rAboutBoxVersion ); rStr.SearchAndReplaceAllAscii( "%OOOVENDOR", rOOOVendor ); rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", rExtension ); |