diff options
| -rw-r--r-- | include/svx/tbcontrl.hxx | 9 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index b4bffeee4831..a0c194a272e7 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -198,15 +198,16 @@ private: SfxStyleSheetBasePool* pStyleSheetPool; SfxStyleControllerItem_Impl* pBoundItems [MAX_FAMILIES]; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES]; + css::uno::Reference< css::lang::XComponent > + m_xBoundItems[MAX_FAMILIES]; SfxTemplateItem* pFamilyState[MAX_FAMILIES]; - sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 - String aCurSel; + sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 + OUString aCurSel; Impl* pImpl; SVX_DLLPRIVATE void Update(); SVX_DLLPRIVATE void FillStyleBox(); - SVX_DLLPRIVATE void SelectStyle( const String& rStyleName ); + SVX_DLLPRIVATE void SelectStyle( const OUString& rStyleName ); friend class SfxStyleControllerItem_Impl; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 779753c45b5f..eca2e22e792b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2048,20 +2048,18 @@ void SvxStyleToolBoxControl::FillStyleBox() // ----------------------------------------------------------------------- -void SvxStyleToolBoxControl::SelectStyle( const String& rStyleName ) +void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName ) { SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)GetToolBox().GetItemWindow( GetId() ); DBG_ASSERT( pBox, "Control not found!" ); if ( pBox ) { -// String aStrSel( pBox->GetSelectEntry() ); - String aStrSel( pBox->GetText() ); + OUString aStrSel( pBox->GetText() ); - if ( rStyleName.Len() > 0 ) + if ( !rStyleName.isEmpty() ) { if ( rStyleName != aStrSel ) -// pBox->SelectEntry( rStyleName ); pBox->SetText( rStyleName ); } else |