diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-28 11:30:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-28 11:31:21 +0100 |
| commit | 6dc887d8d54653203bb01ed9ff0509dd789d2e2f (patch) | |
| tree | defb818ff94f8114e6edfa702878c44da904cac4 /editeng | |
| parent | Updated core (diff) | |
| download | core-6dc887d8d54653203bb01ed9ff0509dd789d2e2f.tar.gz core-6dc887d8d54653203bb01ed9ff0509dd789d2e2f.zip | |
XubString->OUString
Change-Id: I7b76026012af2b57861ec8d3dfd285d9e871d74c
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/editeng.cxx | 4 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit4.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit5.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 89067a265ecc..142be57a958b 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -1547,7 +1547,7 @@ sal_uLong EditEngine::Read( SvStream& rInput, const String& rBaseURL, EETextForm DBG_CHKTHIS( EditEngine, 0 ); sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled(); pImpEditEngine->EnableUndo( sal_False ); - pImpEditEngine->SetText( XubString() ); + pImpEditEngine->SetText( OUString() ); EditPaM aPaM( pImpEditEngine->GetEditDoc().GetStartPaM() ); pImpEditEngine->Read( rInput, rBaseURL, eFormat, EditSelection( aPaM, aPaM ), pHTTPHeaderAttrs ); pImpEditEngine->EnableUndo( bUndoEnabled ); @@ -2760,7 +2760,7 @@ void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const Font& rFont ) void EditEngine::SetFontInfoInItemSet( SfxItemSet& rSet, const SvxFont& rFont ) { rSet.Put( SvxLanguageItem( rFont.GetLanguage(), EE_CHAR_LANGUAGE ) ); - rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(), XubString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) ); + rSet.Put( SvxFontItem( rFont.GetFamily(), rFont.GetName(), OUString(), rFont.GetPitch(), rFont.GetCharSet(), EE_CHAR_FONTINFO ) ); rSet.Put( SvxFontHeightItem( rFont.GetSize().Height(), 100, EE_CHAR_FONTHEIGHT ) ); rSet.Put( SvxCharScaleWidthItem( 100, EE_CHAR_FONTWIDTH ) ); rSet.Put( SvxShadowedItem( rFont.IsShadow(), EE_CHAR_SHADOW ) ); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 50e18065f74d..689d6804d445 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1175,7 +1175,7 @@ void ImpEditEngine::SetText( const EditTextObject& rTextObject ) sal_Bool _bUpdate = GetUpdateMode(); sal_Bool _bUndo = IsUndoEnabled(); - SetText( XubString() ); + SetText( OUString() ); EditPaM aPaM = aEditDoc.GetStartPaM(); SetUpdateMode( sal_False ); diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index fcb0bb067f08..92507c066371 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -227,7 +227,7 @@ void ImpEditEngine::UndoActionStart( sal_uInt16 nId, const ESelection& aSel ) { if ( IsUndoEnabled() && !IsInUndo() ) { - GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), XubString(), nId ); + GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), OUString(), nId ); DBG_ASSERT( !pUndoMarkSelection, "UndoAction SelectionMarker?" ); pUndoMarkSelection = new ESelection( aSel ); } @@ -237,7 +237,7 @@ void ImpEditEngine::UndoActionStart( sal_uInt16 nId ) { if ( IsUndoEnabled() && !IsInUndo() ) { - GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), XubString(), nId ); + GetUndoManager().EnterListAction( GetEditEnginePtr()->GetUndoComment( nId ), OUString(), nId ); DBG_ASSERT( !pUndoMarkSelection, "UndoAction SelectionMarker?" ); } } |