diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-09-02 09:03:31 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-02 12:22:34 +0100 |
commit | ed0f0fa730186a99e3e315ef55f63410af8146b2 (patch) | |
tree | 2f757a4d622846362a3173082f0719a4f823ea57 /editeng | |
parent | 3b6d6d1741fae5940987358c30176858717b4f72 (diff) |
XubString->OUString
Change-Id: I5424a148c7173409e6e56f9483fcc769696707bc
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 14 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 | ||||
-rw-r--r-- | editeng/source/items/bulitem.cxx | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index f5806b399c6b..045835a242ae 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2036,7 +2036,7 @@ void ImpEditEngine::ImpRemoveChars( const EditPaM& rPaM, sal_uInt16 nChars, Edit { if ( IsUndoEnabled() && !IsInUndo() ) { - XubString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) ); + OUString aStr( rPaM.GetNode()->Copy( rPaM.GetIndex(), nChars ) ); // Check whether attributes are deleted or changed: sal_uInt16 nStart = rPaM.GetIndex(); @@ -2895,15 +2895,15 @@ EditPaM ImpEditEngine::InsertParaBreak( EditSelection aCurSel ) { sal_Int32 nPara = aEditDoc.GetPos( aPaM.GetNode() ); OSL_ENSURE( nPara > 0, "AutoIndenting: Error!" ); - XubString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) ); - sal_uInt16 n = 0; - while ( ( n < aPrevParaText.Len() ) && - ( ( aPrevParaText.GetChar(n) == ' ' ) || ( aPrevParaText.GetChar(n) == '\t' ) ) ) + OUString aPrevParaText( GetEditDoc().GetParaAsString( nPara-1 ) ); + sal_Int32 n = 0; + while ( ( n < aPrevParaText.getLength() ) && + ( ( aPrevParaText[n] == ' ' ) || ( aPrevParaText[n] == '\t' ) ) ) { - if ( aPrevParaText.GetChar(n) == '\t' ) + if ( aPrevParaText[n] == '\t' ) aPaM = ImpInsertFeature( aPaM, SfxVoidItem( EE_FEATURE_TAB ) ); else - aPaM = ImpInsertText( aPaM, OUString(aPrevParaText.GetChar(n)) ); + aPaM = ImpInsertText( aPaM, OUString(aPrevParaText[n]) ); n++; } diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 1b094f3dfaee..e746a14fe674 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -263,7 +263,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel ) if ( nNode == nEndNode ) // can also be == nStart! nEndPos = aSel.Max().GetIndex(); } - XubString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); + OUString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); rOutput.WriteByteStringLine( aTmpStr, rOutput.GetStreamCharSet() ); } @@ -661,7 +661,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) if ( n == nEndPortion ) nE = nEndPos; - XubString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); + OUString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); RTFOutFuncs::Out_String( rOutput, aRTFStr, eDestEnc ); rOutput << '}'; } diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx index 074df55db354..8264c0bf434c 100644 --- a/editeng/source/items/bulitem.cxx +++ b/editeng/source/items/bulitem.cxx @@ -370,10 +370,10 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c OUString SvxBulletItem::GetFullText() const { - XubString aStr( aPrevText ); - aStr += cSymbol; - aStr += aFollowText; - return aStr; + OUStringBuffer aStr(aPrevText); + aStr.append(cSymbol); + aStr.append(aFollowText); + return aStr.makeStringAndClear(); } //------------------------------------------------------------------------ |