summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-04 15:49:22 +0200
committerNoel Grandin <noel@peralex.com>2013-09-05 08:55:13 +0200
commita628d232c668ed4a58df8e20f4a363465bc0ff28 (patch)
treeb075087786689e73d5af8f2d29a6771a6f1a95bd
parentef84ce9cec9fff75868433a862db8571440a10b4 (diff)
convert svx/source/customshapes/*.cxx from String to OUString
Change-Id: Ie66bbb6280d050d908e0522cc2cb7a1efe627a6a
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx6
-rw-r--r--svx/source/customshapes/EnhancedCustomShape3d.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 6ec8a724cbb8..a8170f4b4776 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2151,7 +2151,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
aFillColor = GetColorData(
((XFillColorItem&)rCustomShapeSet.Get( XATTR_FILLCOLOR )).GetColorValue(),
std::min(nColorIndex, nColorCount-1), rObj.GetBrightness() );
- rObj.SetMergedItem( XFillColorItem( String(), aFillColor ) );
+ rObj.SetMergedItem( XFillColorItem( "", aFillColor ) );
}
break;
}
@@ -2170,7 +2170,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
std::min(nColorIndex, nColorCount-1), rObj.GetBrightness() ));
}
- rObj.SetMergedItem( XFillGradientItem( String(), aXGradient ) );
+ rObj.SetMergedItem( XFillGradientItem( "", aXGradient ) );
break;
}
case XFILL_HATCH:
@@ -2184,7 +2184,7 @@ void EnhancedCustomShape2d::AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rC
std::min(nColorIndex, nColorCount-1), rObj.GetBrightness() ));
}
- rObj.SetMergedItem( XFillHatchItem( String(), aXHatch ) );
+ rObj.SetMergedItem( XFillHatchItem( "", aXHatch ) );
break;
}
case XFILL_BITMAP:
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index df2694c83df0..7ab45770678d 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -531,7 +531,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
p3DObj->NbcSetLayer( pShape2d->GetLayer() );
p3DObj->SetMergedItemSet( aLocalSet );
if ( bUseExtrusionColor )
- p3DObj->SetMergedItem( XFillColorItem( String(), ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) );
+ p3DObj->SetMergedItem( XFillColorItem( "", ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) );
p3DObj->SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
@@ -552,7 +552,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
else if ( aLocalFillStyle == XFILL_NONE )
{
XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR );
- p3DObj->SetMergedItem( XFillColorItem( String(), rLineColor.GetColorValue() ) );
+ p3DObj->SetMergedItem( XFillColorItem( "", rLineColor.GetColorValue() ) );
p3DObj->SetMergedItem( Svx3DDoubleSidedItem( sal_True ) );
p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );