convert include/svtools/ivctrl.hxx from String to OUString

and de-virtualize the GetEntryText method, because nothing
is overriding it.

Change-Id: Ica8bea0a9332a53791122f637026083beba72f89

2 files changed, 9 insertions, 9 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 );
 
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 298981c149bf..a48bb0d244e7 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::accessibility;
 |
 \*****************************************************************************/
 
-SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image& rImage, sal_uInt16 _nFlags )
+SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const OUString& rText, const Image& rImage, sal_uInt16 _nFlags )
 {
     aText = rText;
     aImage = rImage;
@@ -43,7 +43,7 @@ SvxIconChoiceCtrlEntry::SvxIconChoiceCtrlEntry( const String& rText, const Image
     pflink = 0;
 }
 
-String SvxIconChoiceCtrlEntry::GetDisplayText() const
+OUString SvxIconChoiceCtrlEntry::GetDisplayText() const
 {
     return MnemonicGenerator::EraseAllMnemonicChars( aText );
 }
@@ -110,7 +110,7 @@ void SvtIconChoiceCtrl::DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Po
     rDev.DrawImage( rPos, pEntry->GetImage() );
 }
 
-String SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
+OUString SvtIconChoiceCtrl::GetEntryText( SvxIconChoiceCtrlEntry* pEntry, sal_Bool )
 {
     return pEntry->GetText();
 }