diff options
Diffstat (limited to 'drawinglayer')
4 files changed, 17 insertions, 14 deletions
diff --git a/drawinglayer/qa/unit/border.cxx b/drawinglayer/qa/unit/border.cxx index 60a698927143..0df10ac5e42b 100644 --- a/drawinglayer/qa/unit/border.cxx +++ b/drawinglayer/qa/unit/border.cxx @@ -22,6 +22,7 @@ #include <test/bootstrapfixture.hxx> #include <vcl/vclptr.hxx> #include <vcl/virdev.hxx> +#include <editeng/borderline.hxx> using namespace com::sun::star; @@ -57,7 +58,7 @@ void DrawinglayerBorderTest::testDoubleDecompositionSolid() basegfx::BColor aColorLeft; basegfx::BColor aColorGap; bool bHasGapColor = false; - sal_Int16 nStyle = table::BorderLineStyle::DOUBLE; + SvxBorderLineStyle nStyle = SvxBorderLineStyle::DOUBLE; rtl::Reference<drawinglayer::primitive2d::BorderLinePrimitive2D> aBorder(new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd, fLeftWidth, fDistance, fRightWidth, fExtendLeftStart, fExtendLeftEnd, fExtendRightStart, fExtendRightEnd, aColorRight, aColorLeft, aColorGap, bHasGapColor, nStyle)); // Decompose it into polygons. @@ -107,7 +108,7 @@ void DrawinglayerBorderTest::testDoublePixelProcessing() basegfx::BColor aColorLeft; basegfx::BColor aColorGap; bool bHasGapColor = false; - sal_Int16 nStyle = table::BorderLineStyle::DOUBLE; + SvxBorderLineStyle nStyle = SvxBorderLineStyle::DOUBLE; rtl::Reference<drawinglayer::primitive2d::BorderLinePrimitive2D> xBorder(new drawinglayer::primitive2d::BorderLinePrimitive2D(aStart, aEnd, fLeftWidth, fDistance, fRightWidth, fExtendLeftStart, fExtendLeftEnd, fExtendRightStart, fExtendRightEnd, aColorRight, aColorLeft, aColorGap, bHasGapColor, nStyle)); drawinglayer::primitive2d::Primitive2DContainer aPrimitives; aPrimitives.push_back(drawinglayer::primitive2d::Primitive2DReference(xBorder.get())); diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 3db5cb2d799e..c6ea4a5c41f7 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -25,6 +25,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <svtools/borderhelper.hxx> +#include <editeng/borderline.hxx> #include <algorithm> #include <cmath> @@ -240,7 +241,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( const basegfx::B2DPoint aTmpEnd(getEnd() + (fExt * aVector)); // Get which is the line to show - bool bIsSolidline = mnStyle == css::table::BorderLineStyle::SOLID; + bool bIsSolidline = mnStyle == SvxBorderLineStyle::SOLID; double nWidth = getLeftWidth(); basegfx::BColor aColor = getRGBColorLeft(); if ( basegfx::fTools::equal( 0.0, mfLeftWidth ) ) @@ -333,7 +334,7 @@ primitive2d::Primitive2DReference makeSolidLinePrimitive( const basegfx::BColor& rRGBColorLeft, const basegfx::BColor& rRGBColorGap, bool bHasGapColor, - const short nStyle, + SvxBorderLineStyle nStyle, double fPatternScale) : BufferedDecompositionPrimitive2D(), maStart(rStart), diff --git a/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx index 5a19ee88fc5a..ca44a2838909 100644 --- a/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/clippedborderlineprimitive2d.cxx @@ -33,7 +33,7 @@ namespace drawinglayer const basegfx::BColor& rRGBColorLeft, const basegfx::BColor& rRGBColorGap, bool bHasGapColor, - const short nStyle, + SvxBorderLineStyle nStyle, double fPatternScale) : BorderLinePrimitive2D( rStart, rEnd, fLeftWidth,fDistance, fRightWidth, 0.0, 0.0, 0.0, 0.0, rRGBColorRight, rRGBColorLeft, diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx index 65b77187b5d0..a212fb8b4460 100644 --- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx @@ -53,6 +53,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <svtools/borderhelper.hxx> +#include <editeng/borderline.hxx> #include <com/sun/star/table/BorderLineStyle.hpp> @@ -337,14 +338,14 @@ namespace drawinglayer switch (rSource.getStyle()) { - case table::BorderLineStyle::SOLID: - case table::BorderLineStyle::DOUBLE_THIN: + case SvxBorderLineStyle::SOLID: + case SvxBorderLineStyle::DOUBLE_THIN: { const basegfx::BColor aLineColor = maBColorModifierStack.getModifiedColor(rSource.getRGBColorLeft()); double nThick = rtl::math::round(rSource.getLeftWidth()); - bool bDouble = rSource.getStyle() == table::BorderLineStyle::DOUBLE_THIN; + bool bDouble = rSource.getStyle() == SvxBorderLineStyle::DOUBLE_THIN; basegfx::B2DPolygon aTarget; @@ -441,11 +442,11 @@ namespace drawinglayer return true; } break; - case table::BorderLineStyle::DOTTED: - case table::BorderLineStyle::DASHED: - case table::BorderLineStyle::DASH_DOT: - case table::BorderLineStyle::DASH_DOT_DOT: - case table::BorderLineStyle::FINE_DASHED: + case SvxBorderLineStyle::DOTTED: + case SvxBorderLineStyle::DASHED: + case SvxBorderLineStyle::DASH_DOT: + case SvxBorderLineStyle::DASH_DOT_DOT: + case SvxBorderLineStyle::FINE_DASHED: { std::vector<double> aPattern = svtools::GetLineDashing(rSource.getStyle(), rSource.getPatternScale()*10.0); @@ -1268,7 +1269,7 @@ namespace drawinglayer if (!tryDrawBorderLinePrimitive2DDirect(rBorder)) { - if (rBorder.getStyle() == table::BorderLineStyle::DOUBLE) + if (rBorder.getStyle() == SvxBorderLineStyle::DOUBLE) { primitive2d::Primitive2DContainer aContainer; rBorder.createDecomposition(aContainer, getViewInformation2D(), true); |