some XubString->OUString

Change-Id: Ic2baaa9d6de5e6b53bbd11e5917f206336302f7c

3 files changed, 14 insertions, 14 deletions

diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx
index 71722650651c..a715f37357d7 100644
--- a/vcl/inc/vcl/morebtn.hxx
+++ b/vcl/inc/vcl/morebtn.hxx
@@ -71,10 +71,10 @@ public:
     void                SetText( const OUString& rNewText );
     OUString            GetText() const;
 
-    void                SetMoreText( const XubString& rNewText );
-    void                SetLessText( const XubString& rNewText );
-    XubString           GetMoreText() const;
-    XubString           GetLessText() const;
+    void                SetMoreText( const OUString& rNewText );
+    void                SetLessText( const OUString& rNewText );
+    OUString            GetMoreText() const;
+    OUString            GetLessText() const;
 };
 
 inline void MoreButton::SetState( sal_Bool bNewState )
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 337bdc6d7519..2d3b974f2cc9 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -29,8 +29,8 @@ typedef ::std::vector< Window* > ImplMoreWindowList;
 struct ImplMoreButtonData
 {
     ImplMoreWindowList *mpItemList;
-    XubString           maMoreText;
-    XubString           maLessText;
+    OUString            maMoreText;
+    OUString            maLessText;
 };
 
 // =======================================================================
@@ -219,7 +219,7 @@ OUString MoreButton::GetText() const
 }
 
 // -----------------------------------------------------------------------
-void MoreButton::SetMoreText( const XubString& rText )
+void MoreButton::SetMoreText( const OUString& rText )
 {
     if ( mpMBData )
         mpMBData->maMoreText = rText;
@@ -229,7 +229,7 @@ void MoreButton::SetMoreText( const XubString& rText )
 }
 
 // -----------------------------------------------------------------------
-XubString MoreButton::GetMoreText() const
+OUString MoreButton::GetMoreText() const
 {
     if ( mpMBData )
         return mpMBData->maMoreText;
@@ -238,7 +238,7 @@ XubString MoreButton::GetMoreText() const
 }
 
 // -----------------------------------------------------------------------
-void MoreButton::SetLessText( const XubString& rText )
+void MoreButton::SetLessText( const OUString& rText )
 {
     if ( mpMBData )
         mpMBData->maLessText = rText;
@@ -248,7 +248,7 @@ void MoreButton::SetLessText( const XubString& rText )
 }
 
 // -----------------------------------------------------------------------
-XubString MoreButton::GetLessText() const
+OUString MoreButton::GetLessText() const
 {
     if ( mpMBData )
         return mpMBData->maLessText;
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx
index 5b875278af99..36d038e101cb 100644
--- a/vcl/source/control/quickselectionengine.cxx
+++ b/vcl/source/control/quickselectionengine.cxx
@@ -78,7 +78,7 @@ namespace vcl
     }
 
     //--------------------------------------------------------------------
-    static StringEntryIdentifier findMatchingEntry( const String& _searchString, QuickSelectionEngine_Data& _engineData )
+    static StringEntryIdentifier findMatchingEntry( const OUString& _searchString, QuickSelectionEngine_Data& _engineData )
     {
         const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetLocaleI18nHelper();
             // TODO: do we really need the Window's settings here? The original code used it ...
@@ -138,14 +138,14 @@ namespace vcl
                     m_pData->aSingleSearchChar.reset();
             }
 
-            XubString aSearchTemp( m_pData->sCurrentSearchString );
+            OUString aSearchTemp( m_pData->sCurrentSearchString );
 
             StringEntryIdentifier pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
             OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: found %p", pMatchingEntry );
-            if ( !pMatchingEntry && ( aSearchTemp.Len() > 1 ) && !!m_pData->aSingleSearchChar )
+            if ( !pMatchingEntry && (aSearchTemp.getLength() > 1) && !!m_pData->aSingleSearchChar )
             {
                 // if there's only one letter in the search string, use a different search mode
-                aSearchTemp = *m_pData->aSingleSearchChar;
+                aSearchTemp = OUString(*m_pData->aSingleSearchChar);
                 pMatchingEntry = findMatchingEntry( aSearchTemp, *m_pData );
             }