diff options
| author | Noel Grandin <noel@peralex.com> | 2013-09-18 13:34:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:22 +0200 |
| commit | 6f48261f0e533917a4f519c39af8b0148d7f0a58 (patch) | |
| tree | ebde983b44ae68f80304ad91daa6865b2e8af8bb /sd | |
| parent | 387c414a57e0d96c56cd008b631b2708baace12a (diff) | |
convert sd/.../TitleBar.hxx from String to OUString
Change-Id: I5e98c11d27a890cb70808a860c6edcf43f87a314
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/inc/taskpane/TitleBar.hxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/toolpanel/TitleBar.cxx | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 669fdb8bc7bb..f00ba4aecf04 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -54,7 +54,7 @@ public: */ TitleBar ( ::Window* pParent, - const String& rsTitle, + const OUString& rsTitle, TitleBarType eType, bool bIsExpandable); virtual ~TitleBar (void); @@ -83,7 +83,7 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent); - String GetTitle (void) const; + OUString GetTitle() const { return msTitle; } ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( @@ -92,7 +92,7 @@ public: private: TitleBarType meType; - String msTitle; + OUString msTitle; bool mbExpanded; bool mbFocused; // Size of the bounding box that encloses the title string. diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index 9fa8c80bdfab..ca33f7c21d00 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -49,7 +49,7 @@ namespace sd { namespace toolpanel { const int TitleBar::snIndentationWidth = 16; -TitleBar::TitleBar ( ::Window* pParent, const String& rsTitle, TitleBarType eType, bool bIsExpandable) +TitleBar::TitleBar ( ::Window* pParent, const OUString& rsTitle, TitleBarType eType, bool bIsExpandable) : ::Window (pParent, WB_TABSTOP) , TreeNode(this) , meType(eType) @@ -541,14 +541,6 @@ void TitleBar::DataChanged (const DataChangedEvent& rEvent) -String TitleBar::GetTitle (void) const -{ - return msTitle; -} - - - - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > TitleBar::CreateAccessibleObject ( const ::com::sun::star::uno::Reference< |