get rid of some XubStrings

Change-Id: Ie522330aa1470677ddcc8f9e6d76bbf4a63a9712

5 files changed, 10 insertions, 10 deletions

diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index e8d3f4850ae0..4f67d05137bc 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -590,13 +590,13 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
     if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled())
     {
         SvTreeListEntry* _pEntry = aWordsLB.FirstSelected();
-        XubString aNewWord(aWordED.GetText());
-        String sEntry(aNewWord);
-        XubString aReplaceStr(aReplaceED.GetText());
+        OUString aNewWord(aWordED.GetText());
+        OUString sEntry(aNewWord);
+        OUString aReplaceStr(aReplaceED.GetText());
 
         sal_Int16 nAddRes = DIC_ERR_UNKNOWN;
         sal_uInt16 nPos = aAllDictsLB.GetSelectEntryPos();
-        if ( nPos != LISTBOX_ENTRY_NOTFOUND && aNewWord.Len() > 0)
+        if ( nPos != LISTBOX_ENTRY_NOTFOUND && !aNewWord.isEmpty())
         {
             DBG_ASSERT(nPos < aDics.getLength(), "invalid dictionary index");
             Reference< XDictionary >  xDic( aDics.getConstArray()[ nPos ], UNO_QUERY );
@@ -625,7 +625,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
         if (DIC_ERR_NONE != nAddRes)
             SvxDicError( this, nAddRes );
 
-        if(DIC_ERR_NONE == nAddRes && sEntry.Len())
+        if(DIC_ERR_NONE == nAddRes && !sEntry.isEmpty())
         {
             // insert new entry in list-box etc...
 
@@ -634,7 +634,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
 
             if(aReplaceFT.IsVisible())
             {
-                sEntry += '\t';
+                sEntry += "\t";
                 sEntry += aReplaceStr;
             }
 
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index d24da561f475..4f95ae036f26 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -250,7 +250,7 @@ sal_Bool SwTxtGuess::Guess( const SwTxtPortion& rPor, SwTxtFormatInfo &rInf,
         sal_Unicode cFldChr = 0;
 
 #if OSL_DEBUG_LEVEL > 0
-        XubString aDebugString;
+        OUString aDebugString;
 #endif
 
         // be careful: a field portion can be both: 0x01 (common field)
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 82c6cf8f66a8..d91bf7dd9d15 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1049,7 +1049,7 @@ sal_uInt16 SwTxtNode::Convert( SwConversionArgs &rArgs )
     rArgs.aConvText = rtl::OUString();
 
     // modify string according to redline information and hidden text
-    const XubString aOldTxt( m_Text );
+    const OUString aOldTxt( m_Text );
     const bool bRestoreString =
         lcl_MaskRedlinesAndHiddenText( *this, m_Text, 0, m_Text.Len() ) > 0;
 
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/ui/docvw/AnnotationWin.cxx
index b5eb64c74f83..ccc836950637 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -208,7 +208,7 @@ sal_uInt32 SwAnnotationWin::CountFollowing()
 MenuButton* SwAnnotationWin::CreateMenuButton()
 {
     mpButtonPopup = new PopupMenu(SW_RES(MN_ANNOTATION_BUTTON));
-    XubString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
+    OUString aText = mpButtonPopup->GetItemText( FN_DELETE_NOTE_AUTHOR );
     SwRewriter aRewriter;
     aRewriter.AddRule(UndoArg1,GetAuthor());
     aText = aRewriter.Apply(aText);
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx
index 17ca3caa3df2..36effb9dcd9b 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControl.cxx
@@ -326,7 +326,7 @@ void SidebarTxtControl::Command( const CommandEvent& rCEvt )
             ((PopupMenu*)pMgr->GetSVMenu())->SetSelectHdl( LINK(this, SidebarTxtControl, Select) );
 
             {
-                XubString aText = ((PopupMenu*)pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
+                OUString aText = ((PopupMenu*)pMgr->GetSVMenu())->GetItemText( FN_DELETE_NOTE_AUTHOR );
                 SwRewriter aRewriter;
                 aRewriter.AddRule(UndoArg1, mrSidebarWin.GetAuthor());
                 aText = aRewriter.Apply(aText);