diff options
Diffstat (limited to 'svx/source/svdraw/svdotextpathdecomposition.cxx')
| -rw-r--r-- | svx/source/svdraw/svdotextpathdecomposition.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 077ddce02e..ecccd6fa42 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -38,7 +38,7 @@ #include <svx/sdr/primitive2d/sdrtextprimitive2d.hxx> #include <basegfx/range/b2drange.hxx> #include <vcl/salbtype.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <algorithm> @@ -63,7 +63,7 @@ #include <svx/xlnclit.hxx> #include <svx/xlntrit.hxx> #include <svx/xlnwtit.hxx> -#include <xlinjoit.hxx> +#include <svx/xlinjoit.hxx> #include <svx/xlndsit.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedalphaprimitive2d.hxx> @@ -366,8 +366,8 @@ namespace { const impPathTextPortion* pCandidate = rTextPortions[a]; basegfx::B2DVector aFontScaling; - const drawinglayer::primitive2d::FontAttributes aCandidateFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aCandidateFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aFontScaling, pCandidate->getFont(), pCandidate->isRTL(), @@ -520,7 +520,7 @@ namespace nPortionIndex, nNextGlyphLen, aNewDXArray, - aCandidateFontAttributes, + aCandidateFontAttribute, pCandidate->getLocale(), aRGBShadowColor); @@ -545,7 +545,7 @@ namespace nPortionIndex, nNextGlyphLen, aNewDXArray, - aCandidateFontAttributes, + aCandidateFontAttribute, pCandidate->getLocale(), aRGBColor); |