diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-14 15:47:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-15 09:11:36 +0200 |
| commit | a067546dec428f8d467aa498bf0fd3968582e7eb (patch) | |
| tree | 84098d211b17f3295a95a306d48a4a31b9ad0d84 /include | |
| parent | 6dcb7199db421848ff53167e71fa367417dd70c8 (diff) | |
convert include/svtools/ivctrl.hxx from String to OUString
and de-virtualize the GetEntryText method, because nothing
is overriding it.
Change-Id: Ica8bea0a9332a53791122f637026083beba72f89
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ivctrl.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 81726c71f33a..0a8e05954d71 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -66,7 +66,7 @@ class SvxIconChoiceCtrlEntry Image aImage; OUString aText; - String aQuickHelpText; + OUString aQuickHelpText; void* pUserData; friend class SvxIconChoiceCtrl_Impl; @@ -111,16 +111,16 @@ class SvxIconChoiceCtrlEntry } public: - SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 nFlags = 0 ); + SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage, sal_uInt16 nFlags = 0 ); ~SvxIconChoiceCtrlEntry () {} void SetImage ( const Image& rImage ) { aImage = rImage; } Image GetImage () const { return aImage; } void SetText ( const OUString& rText ) { aText = rText; } OUString GetText () const { return aText; } - String SVT_DLLPUBLIC GetDisplayText() const; - void SetQuickHelpText( const String& rText ) { aQuickHelpText = rText; } - String GetQuickHelpText() const { return aQuickHelpText; } + OUString SVT_DLLPUBLIC GetDisplayText() const; + void SetQuickHelpText( const OUString& rText ) { aQuickHelpText = rText; } + OUString GetQuickHelpText() const { return aQuickHelpText; } void SetUserData ( void* _pUserData ) { pUserData = _pUserData; } void* GetUserData () { return pUserData; } @@ -252,7 +252,7 @@ protected: const Point& rPos, OutputDevice& rDev ); - virtual String GetEntryText( + OUString GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool bInplaceEdit ); |