diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-14 22:21:08 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-15 09:27:56 +0200 |
| commit | cd10abe0ba3b7c6fa5657359506a5d8dd6076dd2 (patch) | |
| tree | 7af313b8721a169e3ea570e7f39328a9f7894afb /sdext | |
| parent | 3eb84bcb4580af50c2ded9f48749384b8455258e (diff) | |
Simplify PPPOptimizerTokenEnum -> OUString
Change-Id: I88176f00c5fb356d63ecfdd291c006e88606a604
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/minimizer/configurationaccess.cxx | 6 | ||||
| -rw-r--r-- | sdext/source/minimizer/configurationaccess.hxx | 2 | ||||
| -rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index 817e83b030fc..527aff257e93 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -162,15 +162,15 @@ ConfigurationAccess::~ConfigurationAccess() { } -OUString ConfigurationAccess::getPath( const PPPOptimizerTokenEnum eToken ) +OUString ConfigurationAccess::getPath( OUString const & token ) { OUString aPath; try { static const OUString sProtocol( "vnd.sun.star.expand:" ); Reference< container::XNameAccess > xSet( OpenConfiguration( true ), UNO_QUERY_THROW ); - if ( xSet->hasByName( TKGet( eToken ) ) ) - xSet->getByName( TKGet( eToken ) ) >>= aPath; + if ( xSet->hasByName( token ) ) + xSet->getByName( token ) >>= aPath; if ( aPath.match( sProtocol, 0 ) ) { OUString aTmp( aPath.copy( 20 ) ); diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index 08785cfb987a..214cc9288ef4 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -87,7 +87,7 @@ class ConfigurationAccess ~ConfigurationAccess(); void SaveConfiguration(); - OUString getPath( const PPPOptimizerTokenEnum ); + OUString getPath( OUString const & token ); OUString getString( const PPPOptimizerTokenEnum ) const; // access to current OptimizerSettings (stored in the first entry of maSettings) diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index e70854386e0c..85874fddaf38 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -118,7 +118,7 @@ void OptimizerDialog::InitRoadmap() InsertRoadmapItem( 3, sal_True, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION ); InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY ); - OUString sBitmapPath( getPath( TK_BitmapPath ) ); + OUString sBitmapPath( getPath( "BitmapPath" ) ); OUString sBitmap( "/minimizepresi_80.png" ); OUString sURL( sBitmapPath += sBitmap ); |