diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-02 15:47:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-02 16:41:23 +0000 |
| commit | c3cc55968eade5c03efca02d4f056b145cd89a70 (patch) | |
| tree | 6abe0694b4ed99f149855aad9e6b2d64cd353d81 /svx | |
| parent | ddd77c84cfeeef96eb8662b03fa29a8103ed559e (diff) | |
remove B2DLineJoin::Middle
and consistently map css::drawing::LineJoint_MIDDLE to the same thing that
css::drawing::LineJoint_MITRE points to everywhere else
Change-Id: I77b7586ea13f3fe84c0529172758256666488d36
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/attribute/sdrformtextattribute.cxx | 5 | ||||
| -rw-r--r-- | svx/source/sdr/primitive2d/sdrattributecreator.cxx | 5 | ||||
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanelBase.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 5 |
4 files changed, 4 insertions, 13 deletions
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 723986f62ab4..3b92f642b53b 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -56,14 +56,11 @@ namespace { switch(eLineJoint) { - case css::drawing::LineJoint_MIDDLE : - { - return basegfx::B2DLineJoin::Middle; - } case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } + case css::drawing::LineJoint_MIDDLE : case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index e25d6346a02d..7bd9d28014c5 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -136,14 +136,11 @@ namespace drawinglayer { switch(eLineJoint) { - case css::drawing::LineJoint_MIDDLE : - { - return basegfx::B2DLineJoin::Middle; - } case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } + case css::drawing::LineJoint_MIDDLE : case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 6de2dcb09c9d..013d8e4fbbc3 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -462,7 +462,6 @@ void LinePropertyPanelBase::updateLineJoint(bool bDisabled, bool bSetOrDefault, switch(pItem->GetValue()) { - case drawing::LineJoint_MIDDLE: case drawing::LineJoint_ROUND: { nEntryPos = 1; @@ -473,6 +472,7 @@ void LinePropertyPanelBase::updateLineJoint(bool bDisabled, bool bSetOrDefault, nEntryPos = 2; break; } + case drawing::LineJoint_MIDDLE: case drawing::LineJoint_MITER: { nEntryPos = 3; diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index cfea596f881a..ace66d914d70 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -355,12 +355,9 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr switch(maLineJoin) { - default : // basegfx::B2DLineJoin::NONE + case basegfx::B2DLineJoin::NONE: mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_NONE)); break; - case basegfx::B2DLineJoin::Middle: - mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_MIDDLE)); - break; case basegfx::B2DLineJoin::Bevel: mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_BEVEL)); break; |