diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-14 22:37:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-15 09:27:57 +0200 |
| commit | 124f5981d800d9159565d953f82475daf7be68df (patch) | |
| tree | 72ba57e4a5783cf779e62258074befb96c459b65 /sdext | |
| parent | cd10abe0ba3b7c6fa5657359506a5d8dd6076dd2 (diff) | |
Simplify PPPOptimizerTokenEnum -> OUString
Change-Id: I8be2a1d603afd26de11e737586590ebb7adcbc42
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/minimizer/optimizerdialog.cxx | 8 | ||||
| -rw-r--r-- | sdext/source/minimizer/optimizerdialog.hxx | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 85874fddaf38..0a5bdf60b7ff 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -309,14 +309,14 @@ void OptimizerDialog::UpdateControlStates( sal_Int16 nPage ) // ----------------------------------------------------------------------------- -OUString OptimizerDialog::GetSelectedString( const PPPOptimizerTokenEnum eToken ) +OUString OptimizerDialog::GetSelectedString( OUString const & token ) { OUString aSelectedItem; Sequence< sal_Int16 > sSelectedItems; Sequence< OUString > sItemList; - if ( ( getControlProperty( TKGet( eToken ), "SelectedItems" ) >>= sSelectedItems ) && - ( getControlProperty( TKGet( eToken ), "StringItemList" ) >>= sItemList ) ) + if ( ( getControlProperty( token, "SelectedItems" ) >>= sSelectedItems ) && + ( getControlProperty( token, "StringItemList" ) >>= sItemList ) ) { if ( sSelectedItems.getLength() == 1 ) { @@ -624,7 +624,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent ) case TK_btnNavCancel : mrOptimizerDialog.endExecute( sal_False ); break; case TK_Button0Pg0 : // delete configuration { - OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( TK_ListBox0Pg0 ) ); + OUString aSelectedItem( mrOptimizerDialog.GetSelectedString( "ListBox0Pg0" ) ); if ( !aSelectedItem.isEmpty() ) { std::vector< OptimizerSettings >::iterator aIter( mrOptimizerDialog.GetOptimizerSettingsByName( aSelectedItem ) ); diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index ff711ba205b0..cdb500ab85f9 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -22,7 +22,6 @@ #include "optimizerdialog.hrc" #include <vector> #include "unodialog.hxx" -#include "pppoptimizertoken.hxx" #include "optimizationstats.hxx" #include "configurationaccess.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> @@ -122,7 +121,7 @@ public : void SwitchPage( sal_Int16 nNewStep ); void UpdateControlStates( sal_Int16 nStep = -1 ); - OUString GetSelectedString( PPPOptimizerTokenEnum eListBox ); + OUString GetSelectedString( OUString const & token ); com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; }; com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; }; const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxContext; }; |