Kaydet (Commit) 7fb84f7d authored tarafından Noel Grandin's avatar Noel Grandin

convert include/sfx2/titledockwin.hxx from String to OUString

Change-Id: Ifd4f1548ad98665288b2b2ea8f14fa0a7e3bd697
üst 48ee66ae
...@@ -50,7 +50,7 @@ namespace sfx2 ...@@ -50,7 +50,7 @@ namespace sfx2
/** sets a title to be displayed in the docking window /** 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. /** 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 ...@@ -63,7 +63,7 @@ namespace sfx2
@return @return
the ID of the newly created toolbox item 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 ); return impl_addDropDownToolBoxItem( i_rItemText, i_nHelpId, i_rCallback );
} }
...@@ -113,13 +113,13 @@ namespace sfx2 ...@@ -113,13 +113,13 @@ namespace sfx2
/** internal version of AddDropDownToolBoxItem /** 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. /** returns the current title.
If no title has been set via SetTitle, then the window text (Window::GetText) is returned. 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: private:
DECL_LINK( OnToolboxItemSelected, ToolBox* ); DECL_LINK( OnToolboxItemSelected, ToolBox* );
......
...@@ -81,7 +81,7 @@ namespace sfx2 ...@@ -81,7 +81,7 @@ namespace sfx2
} }
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
void TitledDockingWindow::SetTitle( const String& i_rTitle ) void TitledDockingWindow::SetTitle( const OUString& i_rTitle )
{ {
m_sTitle = i_rTitle; m_sTitle = i_rTitle;
Invalidate(); Invalidate();
...@@ -220,7 +220,7 @@ namespace sfx2 ...@@ -220,7 +220,7 @@ namespace sfx2
} }
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
String TitledDockingWindow::impl_getTitle() const OUString TitledDockingWindow::impl_getTitle() const
{ {
return !m_sTitle.isEmpty() ? m_sTitle : GetText(); return !m_sTitle.isEmpty() ? m_sTitle : GetText();
} }
...@@ -237,7 +237,7 @@ namespace sfx2 ...@@ -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. // Add the menu before the closer button.
const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() ); const sal_uInt16 nItemCount( m_aToolbox.GetItemCount() );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment