diff options
| -rw-r--r-- | include/sfx2/titledockwin.hxx | 8 | ||||
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 09b500caa6bc..5712d32ad614 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -50,7 +50,7 @@ namespace sfx2 /** sets a title to be displayed in the docking window */ - void SetTitle( const String& i_rTitle ); + void SetTitle( const OUString& i_rTitle ); /** adds a drop down item to the toolbox. Usually, this is used to add some kind of menu to the toolbox. @@ -63,7 +63,7 @@ namespace sfx2 @return the ID of the newly created toolbox item */ - sal_uInt16 AddDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 AddDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback ); } @@ -113,13 +113,13 @@ namespace sfx2 /** internal version of AddDropDownToolBoxItem */ - sal_uInt16 impl_addDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ); + sal_uInt16 impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ); /** returns the current title. If no title has been set via SetTitle, then the window text (Window::GetText) is returned. */ - String impl_getTitle() const; + OUString impl_getTitle() const; private: DECL_LINK( OnToolboxItemSelected, ToolBox* ); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index a8cb0a1610c9..6d33c3933036 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -81,7 +81,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - void TitledDockingWindow::SetTitle( const String& i_rTitle ) + void TitledDockingWindow::SetTitle( const OUString& i_rTitle ) { m_sTitle = i_rTitle; Invalidate(); @@ -220,7 +220,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - String TitledDockingWindow::impl_getTitle() const + OUString TitledDockingWindow::impl_getTitle() const { return !m_sTitle.isEmpty() ? m_sTitle : GetText(); } @@ -237,7 +237,7 @@ namespace sfx2 } //------------------------------------------------------------------------------------------------------------------ - sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const String& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) + sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback ) { // Add the menu before the closer button. const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() ); |