drawinglayer/source/attribute/fontattribute.cxx | 295 ++++++--------- drawinglayer/source/primitive2d/textprimitive2d.cxx | 4 include/drawinglayer/attribute/fillgradientattribute.hxx | 116 ++--- include/drawinglayer/attribute/fillgraphicattribute.hxx | 79 +--- include/drawinglayer/attribute/fillhatchattribute.hxx | 128 +++--- solenv/clang-format/excludelist | 4 6 files changed, 273 insertions(+), 353 deletions(-)
New commits: commit a1e2de23fd1de7880520501736e2241e7d4d85aa Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> AuthorDate: Wed Oct 21 20:55:54 2020 +0200 Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> CommitDate: Wed Oct 21 20:55:54 2020 +0200 remove fill*attribute.hxx from clang-format excludelist Change-Id: Idc70c350b1ed6015d56fd785acf5afbc394056fe diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx index 7363eb4bad89..cc2fab0518dc 100644 --- a/include/drawinglayer/attribute/fillgradientattribute.hxx +++ b/include/drawinglayer/attribute/fillgradientattribute.hxx @@ -23,81 +23,71 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> - -// predefines - -namespace basegfx { - class BColor; +namespace basegfx +{ +class BColor; } -namespace drawinglayer::attribute { - class ImpFillGradientAttribute; +namespace drawinglayer::attribute +{ +class ImpFillGradientAttribute; } - namespace drawinglayer::attribute - { - enum class GradientStyle - { - Linear, - Axial, - Radial, - Elliptical, - Square, - Rect - }; +{ +enum class GradientStyle +{ + Linear, + Axial, + Radial, + Elliptical, + Square, + Rect +}; } // end of namespace drawinglayer::attribute - namespace drawinglayer::attribute - { - class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute - { - public: - typedef o3tl::cow_wrapper< ImpFillGradientAttribute > ImplType; - - private: - ImplType mpFillGradientAttribute; - - public: - /// constructors/assignmentoperator/destructor - FillGradientAttribute( - GradientStyle eStyle, - double fBorder, - double fOffsetX, - double fOffsetY, - double fAngle, - const basegfx::BColor& rStartColor, - const basegfx::BColor& rEndColor, - sal_uInt16 nSteps); - FillGradientAttribute(); - FillGradientAttribute(const FillGradientAttribute&); - FillGradientAttribute(FillGradientAttribute&&); - FillGradientAttribute& operator=(const FillGradientAttribute&); - FillGradientAttribute& operator=(FillGradientAttribute&&); - ~FillGradientAttribute(); - - // checks if the incarnation is default constructed - bool isDefault() const; - - // compare operator - bool operator==(const FillGradientAttribute& rCandidate) const; - - // data read access - GradientStyle getStyle() const; - double getBorder() const; - double getOffsetX() const; - double getOffsetY() const; - double getAngle() const; - const basegfx::BColor& getStartColor() const; - const basegfx::BColor& getEndColor() const; - sal_uInt16 getSteps() const; - }; +{ +class DRAWINGLAYER_DLLPUBLIC FillGradientAttribute +{ +public: + typedef o3tl::cow_wrapper<ImpFillGradientAttribute> ImplType; + +private: + ImplType mpFillGradientAttribute; + +public: + /// constructors/assignmentoperator/destructor + FillGradientAttribute(GradientStyle eStyle, double fBorder, double fOffsetX, double fOffsetY, + double fAngle, const basegfx::BColor& rStartColor, + const basegfx::BColor& rEndColor, sal_uInt16 nSteps); + FillGradientAttribute(); + FillGradientAttribute(const FillGradientAttribute&); + FillGradientAttribute(FillGradientAttribute&&); + FillGradientAttribute& operator=(const FillGradientAttribute&); + FillGradientAttribute& operator=(FillGradientAttribute&&); + ~FillGradientAttribute(); + + // checks if the incarnation is default constructed + bool isDefault() const; + + // compare operator + bool operator==(const FillGradientAttribute& rCandidate) const; + + // data read access + GradientStyle getStyle() const; + double getBorder() const; + double getOffsetX() const; + double getOffsetY() const; + double getAngle() const; + const basegfx::BColor& getStartColor() const; + const basegfx::BColor& getEndColor() const; + sal_uInt16 getSteps() const; +}; } // end of namespace drawinglayer::attribute - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRADIENTATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx b/include/drawinglayer/attribute/fillgraphicattribute.hxx index 380ae0742c3c..4ee0ab3f3ed5 100644 --- a/include/drawinglayer/attribute/fillgraphicattribute.hxx +++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx @@ -22,59 +22,52 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> - -// predefines - class Graphic; -namespace basegfx { - class B2DRange; +namespace basegfx +{ +class B2DRange; } -namespace drawinglayer::attribute { - class ImpFillGraphicAttribute; +namespace drawinglayer::attribute +{ +class ImpFillGraphicAttribute; } - namespace drawinglayer::attribute - { - class DRAWINGLAYER_DLLPUBLIC FillGraphicAttribute - { - public: - typedef o3tl::cow_wrapper< ImpFillGraphicAttribute > ImplType; - - private: - ImplType mpFillGraphicAttribute; - - public: - /// constructors/assignmentoperator/destructor - FillGraphicAttribute( - const Graphic& rGraphic, - const basegfx::B2DRange& rGraphicRange, - bool bTiling, - double fOffsetX = 0.0, - double fOffsetY = 0.0); - FillGraphicAttribute(const FillGraphicAttribute&); - FillGraphicAttribute& operator=(const FillGraphicAttribute&); - ~FillGraphicAttribute(); - - // checks if the incarnation is default constructed - bool isDefault() const; - - // compare operator - bool operator==(const FillGraphicAttribute& rCandidate) const; - - // data read access - const Graphic& getGraphic() const; - const basegfx::B2DRange& getGraphicRange() const; - bool getTiling() const; - double getOffsetX() const; - double getOffsetY() const; - }; +{ +class DRAWINGLAYER_DLLPUBLIC FillGraphicAttribute +{ +public: + typedef o3tl::cow_wrapper<ImpFillGraphicAttribute> ImplType; + +private: + ImplType mpFillGraphicAttribute; + +public: + /// constructors/assignmentoperator/destructor + FillGraphicAttribute(const Graphic& rGraphic, const basegfx::B2DRange& rGraphicRange, + bool bTiling, double fOffsetX = 0.0, double fOffsetY = 0.0); + FillGraphicAttribute(const FillGraphicAttribute&); + FillGraphicAttribute& operator=(const FillGraphicAttribute&); + ~FillGraphicAttribute(); + + // checks if the incarnation is default constructed + bool isDefault() const; + + // compare operator + bool operator==(const FillGraphicAttribute& rCandidate) const; + + // data read access + const Graphic& getGraphic() const; + const basegfx::B2DRange& getGraphicRange() const; + bool getTiling() const; + double getOffsetX() const; + double getOffsetY() const; +}; } // end of namespace drawinglayer::attribute - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLGRAPHICATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx b/include/drawinglayer/attribute/fillhatchattribute.hxx index e3c4c278929e..f13e46bf903b 100644 --- a/include/drawinglayer/attribute/fillhatchattribute.hxx +++ b/include/drawinglayer/attribute/fillhatchattribute.hxx @@ -23,86 +23,78 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> - -// predefines - -namespace basegfx { - class BColor; +namespace basegfx +{ +class BColor; } -namespace drawinglayer::attribute { - class ImpFillHatchAttribute; +namespace drawinglayer::attribute +{ +class ImpFillHatchAttribute; } - namespace drawinglayer::attribute - { - enum class HatchStyle - { - Single, - Double, - Triple - }; +{ +enum class HatchStyle +{ + Single, + Double, + Triple +}; } // end of namespace drawinglayer::attribute - namespace drawinglayer::attribute - { - class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute - { - public: - typedef o3tl::cow_wrapper< ImpFillHatchAttribute > ImplType; - - private: - ImplType mpFillHatchAttribute; - - public: - /// constructors/assignmentoperator/destructor - FillHatchAttribute( - HatchStyle eStyle, - double fDistance, - double fAngle, - const basegfx::BColor& rColor, - sal_uInt32 nMinimalDiscreteDistance, - bool bFillBackground); - FillHatchAttribute(); - FillHatchAttribute(const FillHatchAttribute&); - FillHatchAttribute(FillHatchAttribute&&); - FillHatchAttribute& operator=(const FillHatchAttribute&); - FillHatchAttribute& operator=(FillHatchAttribute&&); - ~FillHatchAttribute(); - - // checks if the incarnation is default constructed - bool isDefault() const; - - // compare operator - bool operator==(const FillHatchAttribute& rCandidate) const; - - // data read access - HatchStyle getStyle() const; - double getDistance() const; - double getAngle() const; - const basegfx::BColor& getColor() const; - - // #i120230# If a minimal discrete distance is wanted (VCL used 3, - // this is the default for the global instance, too), set this - // unequal to zero. Zero means not to use it. If set bigger zero - // (should be at least two, one leads to a full plane filled with - // lines when Distance in discrete views is smaller than one) this - // will be used when the discrete value is less than the given one. - // This is used to 'emulate' old VCL behaviour which makes hatches - // look better by not making distances as small as needed, but - // keeping them on a minimal discrete value for more appealing - // visualisation. - sal_uInt32 getMinimalDiscreteDistance() const; - - bool isFillBackground() const; - }; +{ +class DRAWINGLAYER_DLLPUBLIC FillHatchAttribute +{ +public: + typedef o3tl::cow_wrapper<ImpFillHatchAttribute> ImplType; + +private: + ImplType mpFillHatchAttribute; + +public: + /// constructors/assignmentoperator/destructor + FillHatchAttribute(HatchStyle eStyle, double fDistance, double fAngle, + const basegfx::BColor& rColor, sal_uInt32 nMinimalDiscreteDistance, + bool bFillBackground); + FillHatchAttribute(); + FillHatchAttribute(const FillHatchAttribute&); + FillHatchAttribute(FillHatchAttribute&&); + FillHatchAttribute& operator=(const FillHatchAttribute&); + FillHatchAttribute& operator=(FillHatchAttribute&&); + ~FillHatchAttribute(); + + // checks if the incarnation is default constructed + bool isDefault() const; + + // compare operator + bool operator==(const FillHatchAttribute& rCandidate) const; + + // data read access + HatchStyle getStyle() const; + double getDistance() const; + double getAngle() const; + const basegfx::BColor& getColor() const; + + // #i120230# If a minimal discrete distance is wanted (VCL used 3, + // this is the default for the global instance, too), set this + // unequal to zero. Zero means not to use it. If set bigger zero + // (should be at least two, one leads to a full plane filled with + // lines when Distance in discrete views is smaller than one) this + // will be used when the discrete value is less than the given one. + // This is used to 'emulate' old VCL behaviour which makes hatches + // look better by not making distances as small as needed, but + // keeping them on a minimal discrete value for more appealing + // visualisation. + sal_uInt32 getMinimalDiscreteDistance() const; + + bool isFillBackground() const; +}; } // end of namespace drawinglayer::attribute - #endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLHATCHATTRIBUTE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index f95c837c9a1e..dfb873a2a882 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5721,9 +5721,6 @@ include/desktop/exithelper.h include/desktop/minidump.hxx include/drawinglayer/XShapeDumper.hxx include/drawinglayer/animation/animationtiming.hxx -include/drawinglayer/attribute/fillgradientattribute.hxx -include/drawinglayer/attribute/fillgraphicattribute.hxx -include/drawinglayer/attribute/fillhatchattribute.hxx include/drawinglayer/attribute/linestartendattribute.hxx include/drawinglayer/attribute/materialattribute3d.hxx include/drawinglayer/attribute/sdrallattribute3d.hxx commit ea4fa437cdae65d1b3de0f52000989c869fab55e Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> AuthorDate: Wed Oct 21 20:51:51 2020 +0200 Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> CommitDate: Wed Oct 21 20:51:51 2020 +0200 remove fontattribute.cxx from clang-format excludelist Change-Id: I3720692af45920a4d084fe6ca4dd08bc0598ac13 diff --git a/drawinglayer/source/attribute/fontattribute.cxx b/drawinglayer/source/attribute/fontattribute.cxx index 33903003f8c7..e423b8367f1c 100644 --- a/drawinglayer/source/attribute/fontattribute.cxx +++ b/drawinglayer/source/attribute/fontattribute.cxx @@ -21,182 +21,131 @@ #include <rtl/instance.hxx> #include <rtl/ustring.hxx> - namespace drawinglayer::attribute { - class ImpFontAttribute - { - public: - /// core data - OUString maFamilyName; // Font Family Name - OUString maStyleName; // Font Style Name - sal_uInt16 mnWeight; // Font weight - - bool mbSymbol : 1; // Symbol Font Flag - bool mbVertical : 1; // Vertical Text Flag - bool mbItalic : 1; // Italic Flag - bool mbOutline : 1; // Outline Flag - bool mbRTL : 1; // RTL Flag - bool mbBiDiStrong : 1; // BiDi Flag - bool mbMonospaced : 1; - - ImpFontAttribute( - const OUString& rFamilyName, - const OUString& rStyleName, - sal_uInt16 nWeight, - bool bSymbol, - bool bVertical, - bool bItalic, - bool bMonospaced, - bool bOutline, - bool bRTL, - bool bBiDiStrong) - : maFamilyName(rFamilyName), - maStyleName(rStyleName), - mnWeight(nWeight), - mbSymbol(bSymbol), - mbVertical(bVertical), - mbItalic(bItalic), - mbOutline(bOutline), - mbRTL(bRTL), - mbBiDiStrong(bBiDiStrong), - mbMonospaced(bMonospaced) - { - } - - ImpFontAttribute() - : maFamilyName(), - maStyleName(), - mnWeight(0), - mbSymbol(false), - mbVertical(false), - mbItalic(false), - mbOutline(false), - mbRTL(false), - mbBiDiStrong(false), - mbMonospaced(false) - { - } - - // data read access - const OUString& getFamilyName() const { return maFamilyName; } - const OUString& getStyleName() const { return maStyleName; } - sal_uInt16 getWeight() const { return mnWeight; } - bool getSymbol() const { return mbSymbol; } - bool getVertical() const { return mbVertical; } - bool getItalic() const { return mbItalic; } - bool getOutline() const { return mbOutline; } - bool getRTL() const { return mbRTL; } - bool getBiDiStrong() const { return mbBiDiStrong; } - bool getMonospaced() const { return mbMonospaced; } - - bool operator==(const ImpFontAttribute& rCompare) const - { - return (getFamilyName() == rCompare.getFamilyName() - && getStyleName() == rCompare.getStyleName() - && getWeight() == rCompare.getWeight() - && getSymbol() == rCompare.getSymbol() - && getVertical() == rCompare.getVertical() - && getItalic() == rCompare.getItalic() - && getOutline() == rCompare.getOutline() - && getRTL() == rCompare.getRTL() - && getBiDiStrong() == rCompare.getBiDiStrong() - && getMonospaced() == rCompare.getMonospaced()); - } - }; - - namespace - { - struct theGlobalDefault : - public rtl::Static< FontAttribute::ImplType, theGlobalDefault > {}; - } - - FontAttribute::FontAttribute( - const OUString& rFamilyName, - const OUString& rStyleName, - sal_uInt16 nWeight, - bool bSymbol, - bool bVertical, - bool bItalic, - bool bMonospaced, - bool bOutline, - bool bRTL, - bool bBiDiStrong) - : mpFontAttribute(ImpFontAttribute( - rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong)) - { - } - - FontAttribute::FontAttribute() - : mpFontAttribute(theGlobalDefault::get()) - { - } - - FontAttribute::FontAttribute(const FontAttribute&) = default; - - FontAttribute::FontAttribute(FontAttribute&&) = default; - - FontAttribute::~FontAttribute() = default; - - FontAttribute& FontAttribute::operator=(const FontAttribute&) = default; - - FontAttribute& FontAttribute::operator=(FontAttribute&&) = default; - - bool FontAttribute::operator==(const FontAttribute& rCandidate) const - { - return rCandidate.mpFontAttribute == mpFontAttribute; - } - - const OUString& FontAttribute::getFamilyName() const - { - return mpFontAttribute->getFamilyName(); - } - - const OUString& FontAttribute::getStyleName() const - { - return mpFontAttribute->getStyleName(); - } - - sal_uInt16 FontAttribute::getWeight() const - { - return mpFontAttribute->getWeight(); - } - - bool FontAttribute::getSymbol() const - { - return mpFontAttribute->getSymbol(); - } - - bool FontAttribute::getVertical() const - { - return mpFontAttribute->getVertical(); - } - - bool FontAttribute::getItalic() const - { - return mpFontAttribute->getItalic(); - } - - bool FontAttribute::getOutline() const - { - return mpFontAttribute->getOutline(); - } - - bool FontAttribute::getRTL() const - { - return mpFontAttribute->getRTL(); - } - - bool FontAttribute::getBiDiStrong() const - { - return mpFontAttribute->getBiDiStrong(); - } - - bool FontAttribute::getMonospaced() const - { - return mpFontAttribute->getMonospaced(); - } +class ImpFontAttribute +{ +public: + /// core data + OUString maFamilyName; // Font Family Name + OUString maStyleName; // Font Style Name + sal_uInt16 mnWeight; // Font weight + + bool mbSymbol : 1; // Symbol Font Flag + bool mbVertical : 1; // Vertical Text Flag + bool mbItalic : 1; // Italic Flag + bool mbOutline : 1; // Outline Flag + bool mbRTL : 1; // RTL Flag + bool mbBiDiStrong : 1; // BiDi Flag + bool mbMonospaced : 1; + + ImpFontAttribute(const OUString& rFamilyName, const OUString& rStyleName, sal_uInt16 nWeight, + bool bSymbol, bool bVertical, bool bItalic, bool bMonospaced, bool bOutline, + bool bRTL, bool bBiDiStrong) + : maFamilyName(rFamilyName) + , maStyleName(rStyleName) + , mnWeight(nWeight) + , mbSymbol(bSymbol) + , mbVertical(bVertical) + , mbItalic(bItalic) + , mbOutline(bOutline) + , mbRTL(bRTL) + , mbBiDiStrong(bBiDiStrong) + , mbMonospaced(bMonospaced) + { + } + + ImpFontAttribute() + : maFamilyName() + , maStyleName() + , mnWeight(0) + , mbSymbol(false) + , mbVertical(false) + , mbItalic(false) + , mbOutline(false) + , mbRTL(false) + , mbBiDiStrong(false) + , mbMonospaced(false) + { + } + + // data read access + const OUString& getFamilyName() const { return maFamilyName; } + const OUString& getStyleName() const { return maStyleName; } + sal_uInt16 getWeight() const { return mnWeight; } + bool getSymbol() const { return mbSymbol; } + bool getVertical() const { return mbVertical; } + bool getItalic() const { return mbItalic; } + bool getOutline() const { return mbOutline; } + bool getRTL() const { return mbRTL; } + bool getBiDiStrong() const { return mbBiDiStrong; } + bool getMonospaced() const { return mbMonospaced; } + + bool operator==(const ImpFontAttribute& rCompare) const + { + return (getFamilyName() == rCompare.getFamilyName() + && getStyleName() == rCompare.getStyleName() && getWeight() == rCompare.getWeight() + && getSymbol() == rCompare.getSymbol() && getVertical() == rCompare.getVertical() + && getItalic() == rCompare.getItalic() && getOutline() == rCompare.getOutline() + && getRTL() == rCompare.getRTL() && getBiDiStrong() == rCompare.getBiDiStrong() + && getMonospaced() == rCompare.getMonospaced()); + } +}; + +namespace +{ +struct theGlobalDefault : public rtl::Static<FontAttribute::ImplType, theGlobalDefault> +{ +}; +} + +FontAttribute::FontAttribute(const OUString& rFamilyName, const OUString& rStyleName, + sal_uInt16 nWeight, bool bSymbol, bool bVertical, bool bItalic, + bool bMonospaced, bool bOutline, bool bRTL, bool bBiDiStrong) + : mpFontAttribute(ImpFontAttribute(rFamilyName, rStyleName, nWeight, bSymbol, bVertical, + bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong)) +{ +} + +FontAttribute::FontAttribute() + : mpFontAttribute(theGlobalDefault::get()) +{ +} + +FontAttribute::FontAttribute(const FontAttribute&) = default; + +FontAttribute::FontAttribute(FontAttribute&&) = default; + +FontAttribute::~FontAttribute() = default; + +FontAttribute& FontAttribute::operator=(const FontAttribute&) = default; + +FontAttribute& FontAttribute::operator=(FontAttribute&&) = default; + +bool FontAttribute::operator==(const FontAttribute& rCandidate) const +{ + return rCandidate.mpFontAttribute == mpFontAttribute; +} + +const OUString& FontAttribute::getFamilyName() const { return mpFontAttribute->getFamilyName(); } + +const OUString& FontAttribute::getStyleName() const { return mpFontAttribute->getStyleName(); } + +sal_uInt16 FontAttribute::getWeight() const { return mpFontAttribute->getWeight(); } + +bool FontAttribute::getSymbol() const { return mpFontAttribute->getSymbol(); } + +bool FontAttribute::getVertical() const { return mpFontAttribute->getVertical(); } + +bool FontAttribute::getItalic() const { return mpFontAttribute->getItalic(); } + +bool FontAttribute::getOutline() const { return mpFontAttribute->getOutline(); } + +bool FontAttribute::getRTL() const { return mpFontAttribute->getRTL(); } + +bool FontAttribute::getBiDiStrong() const { return mpFontAttribute->getBiDiStrong(); } +bool FontAttribute::getMonospaced() const { return mpFontAttribute->getMonospaced(); } } // end of namespace diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index e65e7ad48c41..f95c837c9a1e 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3635,7 +3635,6 @@ drawinglayer/source/animation/animationtiming.cxx drawinglayer/source/attribute/fillgradientattribute.cxx drawinglayer/source/attribute/fillgraphicattribute.cxx drawinglayer/source/attribute/fillhatchattribute.cxx -drawinglayer/source/attribute/fontattribute.cxx drawinglayer/source/attribute/lineattribute.cxx drawinglayer/source/attribute/linestartendattribute.cxx drawinglayer/source/attribute/materialattribute3d.cxx commit 5d77c231b49c2e887aabaa8355860453bd366a99 Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> AuthorDate: Wed Oct 21 20:39:46 2020 +0200 Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk> CommitDate: Wed Oct 21 20:39:46 2020 +0200 move the anonymous namespace into drawinglayer::primitive2d Change-Id: I66f7e5602c7a47baeadccfe913b9be984f0a5177 diff --git a/drawinglayer/source/primitive2d/textprimitive2d.cxx b/drawinglayer/source/primitive2d/textprimitive2d.cxx index a756fc22899c..46f10d5f6208 100644 --- a/drawinglayer/source/primitive2d/textprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/textprimitive2d.cxx @@ -27,6 +27,8 @@ using namespace com::sun::star; +namespace drawinglayer::primitive2d +{ namespace { // adapts fontScale for usage with TextLayouter. Input is rScale which is the extracted @@ -78,8 +80,6 @@ basegfx::B2DVector getCorrectedScaleAndFontScale(basegfx::B2DVector& rScale) } } // end of anonymous namespace -namespace drawinglayer::primitive2d -{ void TextSimplePortionPrimitive2D::getTextOutlinesAndTransformation( basegfx::B2DPolyPolygonVector& rTarget, basegfx::B2DHomMatrix& rTransformation) const { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits