diff options
| -rw-r--r-- | sd/source/ui/inc/taskpane/TitledControl.hxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/TitledControl.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/inc/taskpane/TitledControl.hxx b/sd/source/ui/inc/taskpane/TitledControl.hxx index 6b0317106f66..4cd6896a2b53 100644 --- a/sd/source/ui/inc/taskpane/TitledControl.hxx +++ b/sd/source/ui/inc/taskpane/TitledControl.hxx @@ -65,7 +65,7 @@ public: TitledControl ( TreeNode* pParent, ::std::auto_ptr<TreeNode> pControl, - const String& rTitle, + const OUString& rTitle, const ClickHandler& rClickHandler, TitleBar::TitleBarType eType); @@ -92,7 +92,7 @@ public: TreeNode* GetControl (void); const TreeNode* GetConstControl () const; - const String& GetTitle (void) const; + const OUString& GetTitle (void) const; /** Expand the control without informing its container. This method ususally is called by the container as a result of a @@ -127,7 +127,7 @@ public: using Window::Show; private: - String msTitle; + OUString msTitle; bool mbVisible; void* mpUserData; ::std::auto_ptr<ClickHandler> mpClickHandler; diff --git a/sd/source/ui/toolpanel/TitledControl.cxx b/sd/source/ui/toolpanel/TitledControl.cxx index f53037137f3e..7e6fafd658cc 100644 --- a/sd/source/ui/toolpanel/TitledControl.cxx +++ b/sd/source/ui/toolpanel/TitledControl.cxx @@ -34,7 +34,7 @@ namespace sd { namespace toolpanel { TitledControl::TitledControl ( TreeNode* pParent, ::std::auto_ptr<TreeNode> pControl, - const String& rTitle, + const OUString& rTitle, const ClickHandler& rClickHandler, TitleBar::TitleBarType eType) : ::Window (pParent->GetWindow(), WB_TABSTOP), @@ -219,7 +219,7 @@ void TitledControl::KeyInput (const KeyEvent& rEvent) -const String& TitledControl::GetTitle (void) const +const OUString& TitledControl::GetTitle (void) const { return msTitle; } |