[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - include/drawinglayer solenv/clang-format

[Tomaž Vajngerl (via logerrit)]

Rebased ref, commits from common ancestor:
commit 18bd8bd780fa254722e104fa923b652313c5b8c9
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sat Apr 11 12:12:19 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Sat Apr 11 12:14:53 2020 +0200

    remove {line,stroke}attribute.hxx from clang-format blacklist
    
    Change-Id: I4826b94da3982be8807c4eba63971cb7d3df9d8a

diff --git a/include/drawinglayer/attribute/lineattribute.hxx b/include/drawinglayer/attribute/lineattribute.hxx
index 90c50f904fe9..77828a15d21e 100644
--- a/include/drawinglayer/attribute/lineattribute.hxx
+++ b/include/drawinglayer/attribute/lineattribute.hxx
@@ -26,51 +26,50 @@
 #include <com/sun/star/drawing/LineCap.hpp>
 #include <o3tl/cow_wrapper.hxx>
 
-namespace basegfx {
-    class BColor;
+namespace basegfx
+{
+class BColor;
 }
 
-namespace drawinglayer::attribute {
-    class ImpLineAttribute;
+namespace drawinglayer::attribute
+{
+class ImpLineAttribute;
 }
 
 namespace drawinglayer::attribute
 {
-        class DRAWINGLAYER_DLLPUBLIC LineAttribute
-        {
-        public:
-            typedef o3tl::cow_wrapper< ImpLineAttribute > ImplType;
+class DRAWINGLAYER_DLLPUBLIC LineAttribute
+{
+public:
+    typedef o3tl::cow_wrapper<ImpLineAttribute> ImplType;
 
-        private:
-            ImplType  mpLineAttribute;
+private:
+    ImplType mpLineAttribute;
 
-        public:
-            /// constructors/assignmentoperator/destructor
-            explicit LineAttribute(
-                const basegfx::BColor& rColor,
-                double fWidth = 0.0,
-                basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLineJoin::Round,
-                css::drawing::LineCap aLineCap = css::drawing::LineCap_BUTT,
-                double fMiterMinimumAngle = basegfx::deg2rad(15.0));
-            LineAttribute();
-            LineAttribute(const LineAttribute&);
-            LineAttribute& operator=(const LineAttribute&);
-            ~LineAttribute();
+public:
+    /// constructors/assignmentoperator/destructor
+    explicit LineAttribute(const basegfx::BColor& rColor, double fWidth = 0.0,
+                           basegfx::B2DLineJoin aB2DLineJoin = basegfx::B2DLineJoin::Round,
+                           css::drawing::LineCap aLineCap = css::drawing::LineCap_BUTT,
+                           double fMiterMinimumAngle = basegfx::deg2rad(15.0));
+    LineAttribute();
+    LineAttribute(const LineAttribute&);
+    LineAttribute& operator=(const LineAttribute&);
+    ~LineAttribute();
 
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
+    // checks if the incarnation is default constructed
+    bool isDefault() const;
 
-            // compare operator
-            bool operator==(const LineAttribute& rCandidate) const;
+    // compare operator
+    bool operator==(const LineAttribute& rCandidate) const;
 
-            // data read access
-            const basegfx::BColor& getColor() const;
-            double getWidth() const;
-            basegfx::B2DLineJoin getLineJoin() const;
-            css::drawing::LineCap getLineCap() const;
-            double getMiterMinimumAngle() const;
-        };
+    // data read access
+    const basegfx::BColor& getColor() const;
+    double getWidth() const;
+    basegfx::B2DLineJoin getLineJoin() const;
+    css::drawing::LineCap getLineCap() const;
+    double getMiterMinimumAngle() const;
+};
 } // end of namespace drawinglayer
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/strokeattribute.hxx b/include/drawinglayer/attribute/strokeattribute.hxx
index fd9409e9519d..d5d825c54710 100644
--- a/include/drawinglayer/attribute/strokeattribute.hxx
+++ b/include/drawinglayer/attribute/strokeattribute.hxx
@@ -23,43 +23,42 @@
 #include <o3tl/cow_wrapper.hxx>
 #include <vector>
 
-namespace drawinglayer::attribute {
-    class ImpStrokeAttribute;
+namespace drawinglayer::attribute
+{
+class ImpStrokeAttribute;
 }
 
 namespace drawinglayer::attribute
 {
-        class DRAWINGLAYER_DLLPUBLIC StrokeAttribute
-        {
-        public:
-            typedef o3tl::cow_wrapper< ImpStrokeAttribute > ImplType;
+class DRAWINGLAYER_DLLPUBLIC StrokeAttribute
+{
+public:
+    typedef o3tl::cow_wrapper<ImpStrokeAttribute> ImplType;
 
-        private:
-            ImplType mpStrokeAttribute;
+private:
+    ImplType mpStrokeAttribute;
 
-        public:
-            /// constructors/assignmentoperator/destructor
-            explicit StrokeAttribute(
-                const ::std::vector< double >& rDotDashArray,
-                double fFullDotDashLen = 0.0);
-            StrokeAttribute();
-            StrokeAttribute(const StrokeAttribute&);
-            StrokeAttribute(StrokeAttribute&&);
-            StrokeAttribute& operator=(const StrokeAttribute&);
-            StrokeAttribute& operator=(StrokeAttribute&&);
-            ~StrokeAttribute();
+public:
+    /// constructors/assignmentoperator/destructor
+    explicit StrokeAttribute(const ::std::vector<double>& rDotDashArray,
+                             double fFullDotDashLen = 0.0);
+    StrokeAttribute();
+    StrokeAttribute(const StrokeAttribute&);
+    StrokeAttribute(StrokeAttribute&&);
+    StrokeAttribute& operator=(const StrokeAttribute&);
+    StrokeAttribute& operator=(StrokeAttribute&&);
+    ~StrokeAttribute();
 
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
+    // checks if the incarnation is default constructed
+    bool isDefault() const;
 
-            // compare operator
-            bool operator==(const StrokeAttribute& rCandidate) const;
+    // compare operator
+    bool operator==(const StrokeAttribute& rCandidate) const;
 
-            // data read access
-            const ::std::vector< double >& getDotDashArray() const;
-            double getFullDotDashLen() const;
-        };
+    // data read access
+    const ::std::vector<double>& getDotDashArray() const;
+    double getFullDotDashLen() 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 01f1129e7ee0..f64f6002a703 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -5851,7 +5851,6 @@ include/drawinglayer/attribute/fillgradientattribute.hxx
 include/drawinglayer/attribute/fillgraphicattribute.hxx
 include/drawinglayer/attribute/fillhatchattribute.hxx
 include/drawinglayer/attribute/fontattribute.hxx
-include/drawinglayer/attribute/lineattribute.hxx
 include/drawinglayer/attribute/linestartendattribute.hxx
 include/drawinglayer/attribute/materialattribute3d.hxx
 include/drawinglayer/attribute/sdrallattribute3d.hxx
@@ -5864,7 +5863,6 @@ include/drawinglayer/attribute/sdrlinestartendattribute.hxx
 include/drawinglayer/attribute/sdrobjectattribute3d.hxx
 include/drawinglayer/attribute/sdrsceneattribute3d.hxx
 include/drawinglayer/attribute/sdrshadowattribute.hxx
-include/drawinglayer/attribute/strokeattribute.hxx
 include/drawinglayer/geometry/viewinformation3d.hxx
 include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
 include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx