mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XubString->OUString

Browse Source 
Change-Id: I7b76026012af2b57861ec8d3dfd285d9e871d74c
This commit is contained in:
Caolán McNamara
2013-08-28 11:30:22 +01:00
parent c06399eff6
commit 6dc887d8d5
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editeng/source/editeng/editeng.cxx
View File

@@ -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 ) );

2
editeng/source/editeng/impedit4.cxx
View File

@@ -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 );

4
editeng/source/editeng/impedit5.cxx
View File

@@ -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?" );
}
}

2
svx/source/customshapes/EnhancedCustomShape3d.cxx
View File

@@ -442,7 +442,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
// switch from line to fill, copy line attr to fill attr (color, transparence)
aLocalSet.Put(XLineWidthItem(0));
aLocalSet.Put(XLineStyleItem(XLINE_NONE));
aLocalSet.Put(XFillColorItem(XubString(), ((const XLineColorItem&)(aLocalSet.Get(XATTR_LINECOLOR))).GetColorValue()));
aLocalSet.Put(XFillColorItem(OUString(), ((const XLineColorItem&)(aLocalSet.Get(XATTR_LINECOLOR))).GetColorValue()));
aLocalSet.Put(XFillStyleItem(XFILL_SOLID));
aLocalSet.Put(XFillTransparenceItem(((const XLineTransparenceItem&)(aLocalSet.Get(XATTR_LINETRANSPARENCE))).GetValue()));
aLocalFillStyle = XFILL_SOLID;

2
svx/source/sidebar/line/LineWidthControl.cxx
View File

@@ -250,7 +250,7 @@ void LineWidthControl::SetWidthSelect( long lValue, bool bValuable, SfxMapUnit e
MapUnit ePntUnit( MAP_TWIP );
lValue = LogicToLogic( lValue , eOrgUnit, ePntUnit );
XubString strCurrValue = maMFWidth.GetText();
OUString strCurrValue = maMFWidth.GetText();
sal_uInt16 i = 0;
for(; i < 8; i++)
if(strCurrValue == rStr[i])

2
svx/source/svdraw/svdfmtf.cxx
View File

@@ -996,7 +996,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaPolyPolygonAction& rAct)
/**************************************************************************************************/
void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rStr, const MetaAction& rAct )
void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const OUString& rStr, const MetaAction& rAct )
{
// calc text box size, add 5% to make it fit safely

2
svx/source/svdraw/svdfmtf.hxx
View File

@@ -141,7 +141,7 @@ protected:
void DoAction(MetaTextLanguageAction& rAct) { rAct.Execute(&maVD); mbFntDirty = true; }
void DoAction(MetaOverlineColorAction& rAct) { rAct.Execute(&maVD); mbFntDirty = true; }
void ImportText(const Point& rPos, const XubString& rStr, const MetaAction& rAct);
void ImportText(const Point& rPos, const OUString& rStr, const MetaAction& rAct);
void SetAttributes(SdrObject* pObj, bool bForceTextAttr = false);
void InsertObj(SdrObject* pObj, bool bScale = true);
void MapScaling();

10
svx/source/svdraw/svdobj.cxx
View File

@@ -2190,7 +2190,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue();
}
if (rAttr.GetItemState(SDRATTR_LAYERNAME,true,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
OUString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL;
if (pLayAd!=NULL) {
const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, true);
@@ -2205,7 +2205,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
}
if (rAttr.GetItemState(SDRATTR_OBJECTNAME,true,&pPoolItem)==SFX_ITEM_SET) {
XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
OUString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
SetName(aName);
}
Rectangle aNewLogic(rLogic);
@@ -2259,9 +2259,9 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const
if (rLogic.GetHeight()!=rSnap.GetHeight()) {
lcl_SetItem(rAttr,bMerge,SdrLogicSizeHeightItem(rLogic.GetHeight()-1));
}
XubString aName(GetName());
OUString aName(GetName());
if(aName.Len())
if (!aName.isEmpty())
{
lcl_SetItem(rAttr, bMerge, SdrObjectNameItem(aName));
}
@@ -2510,7 +2510,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas
aSet.Put(XLineStyleItem(XLINE_NONE));
Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
aSet.Put(XFillColorItem(XubString(), aColorLine));
aSet.Put(XFillColorItem(OUString(), aColorLine));
aSet.Put(XFillStyleItem(XFILL_SOLID));
aSet.Put(XFillTransparenceItem(nTransLine));

2
sw/source/ui/sidebar/PageMarginControl.cxx
View File

@@ -250,7 +250,7 @@ void PageMarginControl::FillValueSet(
}
else
{
aHelpText = XubString();
aHelpText = OUString();
}
mpMarginValueSet->AddItem(
(bUserCustomValuesAvailable ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS) ), 0,