XubString->OUString

Change-Id: I5835696a3246b4d8f401a1617d2b53ec8c7c5626

9 files changed, 42 insertions, 41 deletions

diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 2d7563b6d737..2eabe080f7a2 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -116,7 +116,7 @@ private:
 protected:
 
     virtual StringCompare   ColCompare(SvTreeListEntry*,SvTreeListEntry*);
-    virtual void            InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+    virtual void            InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind);
 
 
 
diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx
index 422e99cacd92..5781e3a93a86 100644
--- a/svx/inc/svx/fontlb.hxx
+++ b/svx/inc/svx/fontlb.hxx
@@ -104,10 +104,10 @@ protected:
         @descr  Uses current value of maEntryFont to set the entry font (if mbUseFont is true). */
     virtual void                InitEntry(
                                     SvTreeListEntry* pEntry,
-                                    const XubString& rEntryText,
+                                    const OUString& rEntryText,
                                     const Image& rCollImg,
                                     const Image& rExpImg,
-                                    SvLBoxButtonKind eButtonKind );
+                                    SvLBoxButtonKind eButtonKind);
 };
 
 // ============================================================================
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index aad70d4ff44b..0b106cc48e84 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -440,8 +440,8 @@ SvTreeListEntry* SvxRedlinTable::CreateEntry() const
     return new SvxRedlinEntry;
 }
 
-void SvxRedlinTable::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
-    const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind )
+void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
+    const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind)
 {
     SvLBoxButton* pButton;
     SvLBoxString* pString;
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index cde54e5dcbaa..553a4af49e77 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -211,9 +211,9 @@ sal_Bool RecoveryCore::isBrokenTempEntry(const TURLInfo& rInfo)
 }
 
 //===============================================
-void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
+void RecoveryCore::saveBrokenTempEntries(const OUString& rPath)
 {
-    if (sPath.isEmpty())
+    if (rPath.isEmpty())
         return;
 
     if (!m_xRealCore.is())
@@ -225,7 +225,7 @@ void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
     lCopyArgs[0].Name    = PROP_DISPATCHASYNCHRON;
     lCopyArgs[0].Value <<= sal_False;
     lCopyArgs[1].Name    = PROP_SAVEPATH;
-    lCopyArgs[1].Value <<= sPath;
+    lCopyArgs[1].Value <<= rPath;
     lCopyArgs[2].Name    = PROP_ENTRYID;
     // lCopyArgs[2].Value will be changed during next loop ...
 
@@ -249,9 +249,9 @@ void RecoveryCore::saveBrokenTempEntries(const ::rtl::OUString& sPath)
 }
 
 //===============================================
-void RecoveryCore::saveAllTempEntries(const ::rtl::OUString& sPath)
+void RecoveryCore::saveAllTempEntries(const OUString& rPath)
 {
-    if (sPath.isEmpty())
+    if (rPath.isEmpty())
         return;
 
     if (!m_xRealCore.is())
@@ -263,7 +263,7 @@ void RecoveryCore::saveAllTempEntries(const ::rtl::OUString& sPath)
     lCopyArgs[0].Name    = PROP_DISPATCHASYNCHRON;
     lCopyArgs[0].Value <<= sal_False;
     lCopyArgs[1].Name    = PROP_SAVEPATH;
-    lCopyArgs[1].Value <<= sPath;
+    lCopyArgs[1].Value <<= rPath;
     lCopyArgs[2].Name    = PROP_ENTRYID;
     // lCopyArgs[2].Value will be changed during next loop ...
 
@@ -506,12 +506,12 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
 
     aNew.ID          = lInfo.getUnpackedValueOrDefault(STATEPROP_ID         , (sal_Int32)0     );
     aNew.DocState    = lInfo.getUnpackedValueOrDefault(STATEPROP_STATE      , (sal_Int32)0     );
-    aNew.OrgURL      = lInfo.getUnpackedValueOrDefault(STATEPROP_ORGURL     , ::rtl::OUString());
-    aNew.TempURL     = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPURL    , ::rtl::OUString());
-    aNew.FactoryURL  = lInfo.getUnpackedValueOrDefault(STATEPROP_FACTORYURL , ::rtl::OUString());
-    aNew.TemplateURL = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPLATEURL, ::rtl::OUString());
-    aNew.DisplayName = lInfo.getUnpackedValueOrDefault(STATEPROP_TITLE      , ::rtl::OUString());
-    aNew.Module      = lInfo.getUnpackedValueOrDefault(STATEPROP_MODULE     , ::rtl::OUString());
+    aNew.OrgURL      = lInfo.getUnpackedValueOrDefault(STATEPROP_ORGURL     , OUString());
+    aNew.TempURL     = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPURL    , OUString());
+    aNew.FactoryURL  = lInfo.getUnpackedValueOrDefault(STATEPROP_FACTORYURL , OUString());
+    aNew.TemplateURL = lInfo.getUnpackedValueOrDefault(STATEPROP_TEMPLATEURL, OUString());
+    aNew.DisplayName = lInfo.getUnpackedValueOrDefault(STATEPROP_TITLE      , OUString());
+    aNew.Module      = lInfo.getUnpackedValueOrDefault(STATEPROP_MODULE     , OUString());
 
     // search for already existing items and update her nState value ...
     TURLList::iterator pIt;
@@ -897,7 +897,7 @@ void RecovDocListEntry::Paint(const Point&       aPos   ,
                                     SvTreeListEntry* pEntry )
 {
     const Image*        pImg  = 0;
-    const String*       pTxt  = 0;
+    const OUString*     pTxt  = 0;
           RecovDocList* pList = static_cast< RecovDocList* >(&aDevice);
 
     TURLInfo* pInfo  = (TURLInfo*)pEntry->GetUserData();
@@ -970,13 +970,13 @@ RecovDocList::~RecovDocList()
 }
 
 //===============================================
-void RecovDocList::InitEntry(      SvTreeListEntry* pEntry ,
-                             const XubString&   sText  ,
-                             const Image&       aImage1,
-                             const Image&       aImage2,
-                                   SvLBoxButtonKind eButtonKind)
+void RecovDocList::InitEntry(SvTreeListEntry* pEntry,
+                             const OUString& rText,
+                             const Image& rImage1,
+                             const Image& rImage2,
+                             SvLBoxButtonKind eButtonKind)
 {
-    SvTabListBox::InitEntry(pEntry, sText, aImage1, aImage2, eButtonKind);
+    SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind);
     DBG_ASSERT( TabCount() == 2, "*RecovDocList::InitEntry(): structure missmatch" );
 
     SvLBoxString*       pCol = (SvLBoxString*)pEntry->GetItem(2);
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 2f877b1b532a..bcfc2e0f4fec 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -138,9 +138,9 @@ XubString SvxFontListBox::GetSelectEntry() const
 }
 
 void SvxFontListBox::InitEntry(
-        SvTreeListEntry* pEntry, const XubString& rEntryText,
+        SvTreeListEntry* pEntry, const OUString& rEntryText,
         const Image& rCollImg, const Image& rExpImg,
-        SvLBoxButtonKind eButtonKind )
+        SvLBoxButtonKind eButtonKind)
 {
     if( mbUseFont )
     {
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 4b2cec0b4b35..919ec65ea37a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1450,10 +1450,10 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
 
 //------------------------------------------------------------------------
 void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
-                                  const XubString& rStr,
+                                  const OUString& rStr,
                                   const Image& rImg1,
                                   const Image& rImg2,
-                                                                  SvLBoxButtonKind eButtonKind)
+                                  SvLBoxButtonKind eButtonKind)
 {
     SvTreeListBox::InitEntry( pEntry, rStr, rImg1, rImg2, eButtonKind );
     SvLBoxString* pString = NULL;
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index e037ea4fecfc..5c3b2f01c43f 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -591,11 +591,11 @@ class RecovDocList : public SvxSimpleTable
         Image  m_aYellowCheckImg;
         Image  m_aRedCrossImg;
 
-        String m_aSuccessRecovStr;
-        String m_aOrigDocRecovStr;
-        String m_aRecovFailedStr;
-        String m_aRecovInProgrStr;
-        String m_aNotRecovYetStr;
+        OUString m_aSuccessRecovStr;
+        OUString m_aOrigDocRecovStr;
+        OUString m_aRecovFailedStr;
+        OUString m_aRecovInProgrStr;
+        OUString m_aNotRecovYetStr;
 
     //-------------------------------------------
     // interface
@@ -610,11 +610,11 @@ class RecovDocList : public SvxSimpleTable
 
         //---------------------------------------
         /** @short TODO */
-        virtual void InitEntry(      SvTreeListEntry* pEntry ,
-                               const XubString&   sText  ,
-                               const Image&       aImage1,
-                               const Image&       aImage2,
-                                     SvLBoxButtonKind eButtonKind);
+        virtual void InitEntry(SvTreeListEntry* pEntry,
+                               const OUString& rText,
+                               const Image& rImage1,
+                               const Image& rImage2,
+                               SvLBoxButtonKind eButtonKind);
 };
 
 //===============================================
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 816ed67bdcdf..805cd8c3311a 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -284,7 +284,7 @@ protected:
     virtual void KeyInput( const KeyEvent& rKEvt );
     virtual void Command( const CommandEvent& rEvt );
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-    virtual void InitEntry(SvTreeListEntry* pEntry, const XubString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
+    virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind);
     virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
     virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection );
     virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText );
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 01a721f516b5..657f78e493d4 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -535,7 +535,7 @@ public:
 
     SvTreeListEntry*    findAtom( Atom* pAtom );
 
-    virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&);
+    virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&);
     virtual void SetTabs();
 
 private:
@@ -591,7 +591,8 @@ void AtomContainerTreeListBox::SetTabs()
     AddTab( nStartPos, SV_LBOXTAB_DYNAMIC|SV_LBOXTAB_ADJUST_LEFT | SV_LBOXTAB_SHOW_SELECTION );
 }
 
-void AtomContainerTreeListBox::InitEntry(SvTreeListEntry* pEntry,const XubString& aStr,const Image& aCollEntryBmp,const Image& aExpEntryBmp)
+void AtomContainerTreeListBox::InitEntry(SvTreeListEntry* pEntry, const OUString& aStr,
+    const Image& aCollEntryBmp, const Image& aExpEntryBmp)
 {
     pEntry->AddItem( new SvLBoxContextBmp( pEntry,0, aCollEntryBmp,aExpEntryBmp, SVLISTENTRYFLAG_EXPANDED ) );
     pEntry->AddItem( new SvLBoxContextBmp( pEntry,0, maImgAtom, maImgAtom, SVLISTENTRYFLAG_EXPANDED ) );