include/drawinglayer/attribute/fontattribute.hxx | 91 ++++++++----------- include/drawinglayer/primitive2d/textprimitive2d.hxx | 7 - solenv/clang-format/blacklist | 1 3 files changed, 43 insertions(+), 56 deletions(-)
New commits: commit a9ace8428b7919e68f01fa60dc1a9d2b095610e3 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Wed Jun 3 16:58:33 2020 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Sat Jun 27 22:42:54 2020 +0200 organise includes in textprimitive2d.hxx Change-Id: I6f822707520688cb3b5b501094e238f02e90ce56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97286 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 22ff79a69d6e..9aeaa96fc15e 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -22,15 +22,14 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/attribute/fontattribute.hxx> +#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <rtl/ustring.hxx> #include <tools/color.hxx> #include <basegfx/color/bcolor.hxx> -#include <vector> #include <com/sun/star/lang/Locale.hpp> -#include <drawinglayer/attribute/fontattribute.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> - +#include <vector> namespace drawinglayer::primitive2d { commit 065798497d5f1c49c1501e2f73079e424231a892 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Wed Jun 3 16:55:35 2020 +0200 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Sat Jun 27 22:42:38 2020 +0200 drawinglayer: remove fontattribute.hxx from clang-format blacklist Change-Id: I58ef867586bdd2c8c9f4eb249f10610860c9568a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97285 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/include/drawinglayer/attribute/fontattribute.hxx b/include/drawinglayer/attribute/fontattribute.hxx index 5972000443a5..1a7250170b6e 100644 --- a/include/drawinglayer/attribute/fontattribute.hxx +++ b/include/drawinglayer/attribute/fontattribute.hxx @@ -21,67 +21,56 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <o3tl/cow_wrapper.hxx> +#include <rtl/ustring.hxx> - -namespace rtl { - class OUString; -} - -namespace drawinglayer::attribute { - class ImpFontAttribute; +namespace drawinglayer::attribute +{ +class ImpFontAttribute; } namespace drawinglayer::attribute { - /** FontAttribute class +/** FontAttribute class - This attribute class is able to hold all parameters needed/used - to completely define the parametrisation of a text portion. - */ - class DRAWINGLAYER_DLLPUBLIC FontAttribute - { - public: - typedef o3tl::cow_wrapper< ImpFontAttribute > ImplType; + This attribute class is able to hold all parameters needed/used + to completely define the parametrisation of a text portion. + */ +class DRAWINGLAYER_DLLPUBLIC FontAttribute +{ +public: + typedef o3tl::cow_wrapper<ImpFontAttribute> ImplType; - private: - ImplType mpFontAttribute; +private: + ImplType mpFontAttribute; - public: - /// constructors/assignmentoperator/destructor - /// TODO: pair kerning and CJK kerning - FontAttribute( - const rtl::OUString& rFamilyName, - const rtl::OUString& rStyleName, - sal_uInt16 nWeight, - bool bSymbol = false, - bool bVertical = false, - bool bItalic = false, - bool bMonospaced = false, - bool bOutline = false, - bool bRTL = false, - bool bBiDiStrong = false); - FontAttribute(); - FontAttribute(const FontAttribute&); - FontAttribute(FontAttribute&&); - FontAttribute& operator=(const FontAttribute&); - FontAttribute& operator=(FontAttribute&&); - ~FontAttribute(); +public: + /// TODO: pair kerning and CJK kerning + FontAttribute(const OUString& rFamilyName, const OUString& rStyleName, sal_uInt16 nWeight, + bool bSymbol = false, bool bVertical = false, bool bItalic = false, + bool bMonospaced = false, bool bOutline = false, bool bRTL = false, + bool bBiDiStrong = false); + FontAttribute(); + FontAttribute(const FontAttribute&); + FontAttribute(FontAttribute&&); + FontAttribute& operator=(const FontAttribute&); + FontAttribute& operator=(FontAttribute&&); + ~FontAttribute(); - // compare operator - bool operator==(const FontAttribute& rCandidate) const; + // compare operator + bool operator==(const FontAttribute& rCandidate) const; - /// data read access - const rtl::OUString& getFamilyName() const; - const rtl::OUString& getStyleName() const; - sal_uInt16 getWeight() const; - bool getSymbol() const; - bool getVertical() const; - bool getItalic() const; - bool getOutline() const; - bool getRTL() const; - bool getBiDiStrong() const; - bool getMonospaced() const; - }; + /// data read access + const OUString& getFamilyName() const; + const OUString& getStyleName() const; + sal_uInt16 getWeight() const; + bool getSymbol() const; + bool getVertical() const; + bool getItalic() const; + bool getOutline() const; + bool getRTL() const; + bool getBiDiStrong() const; + bool getMonospaced() const; +}; } // end of namespace drawinglayer::attribute /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 4bbd268faa57..3ec0d66c4834 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -5823,7 +5823,6 @@ include/drawinglayer/animation/animationtiming.hxx include/drawinglayer/attribute/fillgradientattribute.hxx include/drawinglayer/attribute/fillgraphicattribute.hxx include/drawinglayer/attribute/fillhatchattribute.hxx -include/drawinglayer/attribute/fontattribute.hxx include/drawinglayer/attribute/linestartendattribute.hxx include/drawinglayer/attribute/materialattribute3d.hxx include/drawinglayer/attribute/sdrallattribute3d.hxx _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
