summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-03 14:31:19 +0200
committerNoel Grandin <noel@peralex.com>2015-06-04 08:30:24 +0200
commit42f771d6e9c02c50acc49f7feb1a9b5d0a9368ae (patch)
tree227208438b1723a20842ff8555b1bbb1e8b8ba27 /svx
parent1d92933d96d94819fa3a4ae2de9519874f9b92b6 (diff)
convert B2DLineJoin to scoped enum
Change-Id: I4fb8f2c9e2080e3aa542d2ccf838e6784baa8429
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/attribute/sdrformtextattribute.cxx10
-rw-r--r--svx/source/sdr/primitive2d/sdrattributecreator.cxx10
-rw-r--r--svx/source/svdraw/svdfmtf.cxx16
3 files changed, 18 insertions, 18 deletions
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 03af4df32def..f4d7be6c2339 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -58,23 +58,23 @@ namespace
{
case com::sun::star::drawing::LineJoint_MIDDLE :
{
- return basegfx::B2DLINEJOIN_MIDDLE;
+ return basegfx::B2DLineJoin::Middle;
}
case com::sun::star::drawing::LineJoint_BEVEL :
{
- return basegfx::B2DLINEJOIN_BEVEL;
+ return basegfx::B2DLineJoin::Bevel;
}
case com::sun::star::drawing::LineJoint_MITER :
{
- return basegfx::B2DLINEJOIN_MITER;
+ return basegfx::B2DLineJoin::Miter;
}
case com::sun::star::drawing::LineJoint_ROUND :
{
- return basegfx::B2DLINEJOIN_ROUND;
+ return basegfx::B2DLineJoin::Round;
}
default : // com::sun::star::drawing::LineJoint_NONE
{
- return basegfx::B2DLINEJOIN_NONE; // XLINEJOINT_NONE
+ return basegfx::B2DLineJoin::NONE; // XLINEJOINT_NONE
}
}
}
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 4ac6708d24c7..522236729c62 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -138,23 +138,23 @@ namespace drawinglayer
{
case com::sun::star::drawing::LineJoint_MIDDLE :
{
- return basegfx::B2DLINEJOIN_MIDDLE;
+ return basegfx::B2DLineJoin::Middle;
}
case com::sun::star::drawing::LineJoint_BEVEL :
{
- return basegfx::B2DLINEJOIN_BEVEL;
+ return basegfx::B2DLineJoin::Bevel;
}
case com::sun::star::drawing::LineJoint_MITER :
{
- return basegfx::B2DLINEJOIN_MITER;
+ return basegfx::B2DLineJoin::Miter;
}
case com::sun::star::drawing::LineJoint_ROUND :
{
- return basegfx::B2DLINEJOIN_ROUND;
+ return basegfx::B2DLineJoin::Round;
}
default : // com::sun::star::drawing::LineJoint_NONE
{
- return basegfx::B2DLINEJOIN_NONE;
+ return basegfx::B2DLineJoin::NONE;
}
}
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 1c12fc47f778..6c58c10c25bb 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -88,7 +88,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(
mnLayer(nLay),
maOldLineColor(),
mnLineWidth(0),
- maLineJoin(basegfx::B2DLINEJOIN_NONE),
+ maLineJoin(basegfx::B2DLineJoin::NONE),
maLineCap(com::sun::star::drawing::LineCap_BUTT),
maDash(css::drawing::DashStyle_RECT, 0, 0, 0, 0, 0),
mbMov(false),
@@ -355,19 +355,19 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr
switch(maLineJoin)
{
- default : // basegfx::B2DLINEJOIN_NONE
+ default : // basegfx::B2DLineJoin::NONE
mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE));
break;
- case basegfx::B2DLINEJOIN_MIDDLE:
+ case basegfx::B2DLineJoin::Middle:
mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_MIDDLE));
break;
- case basegfx::B2DLINEJOIN_BEVEL:
+ case basegfx::B2DLineJoin::Bevel:
mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL));
break;
- case basegfx::B2DLINEJOIN_MITER:
+ case basegfx::B2DLineJoin::Miter:
mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER));
break;
- case basegfx::B2DLINEJOIN_ROUND:
+ case basegfx::B2DLineJoin::Round:
mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND));
break;
}
@@ -707,7 +707,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaLineAction& rAct)
rLineInfo.GetDistance());
SetAttributes(pPath);
mnLineWidth = 0;
- maLineJoin = basegfx::B2DLINEJOIN_NONE;
+ maLineJoin = basegfx::B2DLineJoin::NONE;
maDash = XDash();
InsertObj(pPath, false);
}
@@ -933,7 +933,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaPolyLineAction& rAct )
rLineInfo.GetDistance());
SetAttributes(pPath);
mnLineWidth = 0;
- maLineJoin = basegfx::B2DLINEJOIN_NONE;
+ maLineJoin = basegfx::B2DLineJoin::NONE;
maDash = XDash();
InsertObj(pPath, false);
}