summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorPeter Burow <pb@openoffice.org>2001-01-23 10:56:12 +0000
committerPeter Burow <pb@openoffice.org>2001-01-23 10:56:12 +0000
commitb3e5f2574fc363009882bb40c4a6da5af70c88a2 (patch)
treecfbd94c2af718b8d1ecd755dc3b392d09396396a /desktop
parente22db9a47aa4b90fdf332d77109972efe056e21f (diff)
fix: #82184# added
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/app.cxx22
1 files changed, 18 insertions, 4 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6748a89c48dc..a7c01379dacd 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: app.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: mba $ $Date: 2000-12-15 15:38:54 $
+ * last change: $Author: pb $ $Date: 2001-01-23 11:56:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -89,6 +89,10 @@ void ReplaceStringHookProc( UniString& rStr )
{
static String aBrandName;
static String aVersion;
+ static String aExtension;
+
+ static int nAll = 0, nPro = 0;
+
if ( !aBrandName.Len() )
{
Any aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME );
@@ -99,10 +103,20 @@ void ReplaceStringHookProc( UniString& rStr )
aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION );
aRet >>= aTmp;
aVersion = aTmp;
+
+ aRet = ::utl::ConfigManager::GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTEXTENSION );
+ aRet >>= aTmp;
+ aExtension = aTmp;
}
- rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", aBrandName );
- rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", aVersion );
+ nAll++;
+ if ( rStr.SearchAscii( "%PRODUCT" ) != STRING_NOTFOUND )
+ {
+ nPro++;
+ rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", aBrandName );
+ rStr.SearchAndReplaceAllAscii( "%PRODUCTVERSION", aVersion );
+ rStr.SearchAndReplaceAllAscii( "%PRODUCTEXTENSION", aExtension );
+ }
}
Desktop aDesktop;