diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-11 22:48:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-11 22:49:21 +0100 |
| commit | c1758889cbd5e8e4afb1044425c908715eb3e1cd (patch) | |
| tree | ff58b017da12c009f0b17c067787d1dbbd52eb7a /padmin | |
| parent | 4ffcc73fa25f174c2d1e161f02cce2d7afc15e3b (diff) | |
Heavily simplified utl::ConfigManager.
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/padialog.cxx | 6 | ||||
| -rw-r--r-- | padmin/source/pamain.cxx | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 67b84a41716d..67a2bd181bce 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -417,12 +417,6 @@ void SpaPrinterController::printPage( int ) const pPrinter->SetMapMode( aMapMode ); - Any aRet = utl::ConfigManager::GetDirectConfigProperty( utl::ConfigManager::PRODUCTNAME ); - OUString aJobName; - aRet >>= aJobName; - - aJobName = aJobName + OUString( RTL_CONSTASCII_USTRINGPARAM( " Testpage" ) ); - Size aPaperSize=pPrinter->GetOutputSize(); Point aCenter( aPaperSize.Width()/2-300, aPaperSize.Height() - aPaperSize.Width()/2 ); diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx index 63c46fd3160b..71ee0e77e09e 100644 --- a/padmin/source/pamain.cxx +++ b/padmin/source/pamain.cxx @@ -71,15 +71,8 @@ MyApp aMyApp; void MyApp::ReadStringHook( String& rStr ) { - static String maProduct; - if( ! maProduct.Len() ) - { - Any aRet = utl::ConfigManager::GetDirectConfigProperty( utl::ConfigManager::PRODUCTNAME ); - OUString aProd; - aRet >>= aProd; - maProduct = String( aProd ); - } - rStr.SearchAndReplaceAllAscii( "%PRODUCTNAME", maProduct ); + rStr.SearchAndReplaceAllAscii( + "%PRODUCTNAME", utl::ConfigManager::getProductName() ); }; |