[Libreoffice-commits] core.git: include/drawinglayer solenv/clang-format
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Mon Nov 23 09:37:20 UTC 2020
include/drawinglayer/attribute/fillgradientattribute.hxx | 116 ++++++-------
include/drawinglayer/attribute/fillgraphicattribute.hxx | 79 ++++-----
include/drawinglayer/attribute/fillhatchattribute.hxx | 128 +++++++--------
solenv/clang-format/excludelist | 3
4 files changed, 149 insertions(+), 177 deletions(-)
New commits:
commit 99b4f42fca6a8a17d10cdb94243c7b602a234a79
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Wed Oct 21 20:55:54 2020 +0200
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Nov 23 10:36:20 2020 +0100
remove fill*attribute.hxx from clang-format excludelist
Change-Id: Idc70c350b1ed6015d56fd785acf5afbc394056fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106386
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
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 c14d8171fe8b..80fbbe2735f1 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -5230,9 +5230,6 @@ include/dbaccess/genericcontroller.hxx
include/desktop/crashreport.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
More information about the Libreoffice-commits
mailing list