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 /filter | |
| parent | 4ffcc73fa25f174c2d1e161f02cce2d7afc15e3b (diff) | |
Heavily simplified utl::ConfigManager.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 10 | ||||
| -rw-r--r-- | filter/source/pdf/pdfexport.cxx | 17 |
2 files changed, 6 insertions, 21 deletions
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 369c50fdedaf..d53200cacbe9 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -484,15 +484,9 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) ImplWriteLine( "%%Pages: 0" ); ::rtl::OUStringBuffer aCreator; aCreator.appendAscii( RTL_CONSTASCII_STRINGPARAM( "%%Creator: " ) ); - ::utl::ConfigManager& rMgr = ::utl::ConfigManager::GetConfigManager(); - Any aProductName = rMgr.GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ); - ::rtl::OUString sProductName; - aProductName >>= sProductName; - aCreator.append( sProductName ); - aProductName = rMgr.GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION ); - aProductName >>= sProductName; + aCreator.append( utl::ConfigManager::getProductName() ); aCreator.appendAscii( RTL_CONSTASCII_STRINGPARAM( " " ) ); - aCreator.append( sProductName ); + aCreator.append( utl::ConfigManager::getProductVersion() ); ImplWriteLine( ::rtl::OUStringToOString( aCreator.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ).getStr() ); ImplWriteLine( "%%Title: none" ); ImplWriteLine( "%%CreationDate: none" ); diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 302909f04c84..b183108f4405 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -444,19 +444,10 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue } } // getting the string for the producer - String aProducer; - { - ::utl::ConfigManager& cMgr = ::utl::ConfigManager::GetConfigManager(); - Any aProductName = cMgr.GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTNAME ); - ::rtl::OUString sProductName; - aProductName >>= sProductName; - aProducer = sProductName; - aProductName = cMgr.GetDirectConfigProperty( ::utl::ConfigManager::PRODUCTVERSION ); - aProductName >>= sProductName; - aProducer.AppendAscii(" "); - aProducer += String( sProductName ); - } - aContext.DocumentInfo.Producer = aProducer; + aContext.DocumentInfo.Producer = + utl::ConfigManager::getProductName() + + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + + utl::ConfigManager::getProductVersion(); aContext.DocumentInfo.Creator = aCreator; for( sal_Int32 nData = 0, nDataCount = rFilterData.getLength(); nData < nDataCount; ++nData ) |