summaryrefslogtreecommitdiff
path: root/svx/source/engine3d
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-09-20 09:49:51 +0200
committerNoel Grandin <noel@peralex.com>2013-10-01 10:08:36 +0200
commit9dc41e228dd60c60a4364d26270c9769d2939ded (patch)
tree960bad38180b7cc8d185e392fc67df8975eecf00 /svx/source/engine3d
parentfd8f8bdaadc6bac6cf57c335422482a6793211a2 (diff)
convert remnants of String in SVX to String
Change-Id: I66fd6387c3fcd33c6ae0b431810abf6679345767
Diffstat (limited to 'svx/source/engine3d')
-rw-r--r--svx/source/engine3d/float3d.cxx2
-rw-r--r--svx/source/engine3d/view3d.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 619511957c23..eb54d3cf2ca8 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -1672,7 +1672,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
// the default (Blue7) is not used for 3d preview
if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
- aSet.Put(XFillColorItem(String(), Color(COL_WHITE)));
+ aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
aCtlPreview.Set3DAttributes(aSet);
aCtlLightPreview.GetSvx3DLightControl().Set3DAttributes(aSet);
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 15a4787a68bd..3aee208d33ae 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -736,7 +736,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
// Fill color must be the color line, because the object was
// previously just a line
Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
- aSet.Put(XFillColorItem(String(), aColorLine));
+ aSet.Put(XFillColorItem(OUString(), aColorLine));
}
// Create a new extrude object
@@ -1578,7 +1578,7 @@ void E3dView::Break3DObj()
// ALL selected objects are changed
sal_uInt32 nCount = GetMarkedObjectCount();
- BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)));
+ BegUndo(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE));
for(sal_uInt32 a=0;a<nCount;a++)
{
E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a);