diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-25 23:01:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-26 01:33:50 +0000 |
| commit | 9b5111e7f91f958e37ab25280d678afb9de4bead (patch) | |
| tree | 66b279bab86a595e01ca44d0db98c59973da0b48 /sw | |
| parent | remove unnecessary calls to copy c'tor (diff) | |
| download | core-9b5111e7f91f958e37ab25280d678afb9de4bead.tar.gz core-9b5111e7f91f958e37ab25280d678afb9de4bead.zip | |
get rid of some XubStrings
Change-Id: Ie522330aa1470677ddcc8f9e6d76bbf4a63a9712
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/guess.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/txtnode/txtedt.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/AnnotationWin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/docvw/SidebarTxtControl.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
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); |