[Libreoffice-commits] core.git: include/drawinglayer solenv/clang-format

[Tomaž Vajngerl (via logerrit)]

 include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx |  103 +++++-----
 solenv/clang-format/blacklist                                   |    1 
 2 files changed, 53 insertions(+), 51 deletions(-)

New commits:
commit f31b00b1a43f0d2fab2762ada230cd6dc267b6a4
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Feb 3 18:00:29 2020 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Feb 4 08:35:42 2020 +0100

    remove backgroundcolorprimitive2d.hxx from clang-format blacklist
    
    Change-Id: I8ad988dd0eb6a4bbbe9fc9bbc773c692cab4401f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87936
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
index b88a43f4d26e..127353581212 100644
--- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
@@ -24,60 +24,63 @@
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 
-
 // BackgroundColorPrimitive2D class
 
 namespace drawinglayer
 {
-    namespace primitive2d
-    {
-        /** BackgroundColorPrimitive2D class
-
-            This primitive is defined to fill the whole visible Viewport with
-            the given color (and thus decomposes to a filled polygon). This
-            makes it a view-dependent primitive by definition. It only has
-            a valid decomposition if a valid Viewport is given in the
-            ViewInformation2D at decomposition time.
-
-            It will try to buffer its last decomposition using maLastViewport
-            to detect changes in the get2DDecomposition call.
-         */
-        class DRAWINGLAYER_DLLPUBLIC BackgroundColorPrimitive2D final : public BufferedDecompositionPrimitive2D
-        {
-        private:
-            /// the fill color to use
-            basegfx::BColor                             maBColor;
-            double mfTransparency;
-
-            /// the last used viewInformation, used from getDecomposition for buffering
-            basegfx::B2DRange                           maLastViewport;
-
-            /// create local decomposition
-            virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
-
-        public:
-            /// constructor
-            explicit BackgroundColorPrimitive2D(
-                const basegfx::BColor& rBColor,
-                double fTransparency = 0);
-
-            /// data read access
-            const basegfx::BColor& getBColor() const { return maBColor; }
-            double getTransparency() const { return mfTransparency; }
-
-            /// compare operator
-            virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
-
-            /// get B2Drange
-            virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
-
-            /// provide unique ID
-            virtual sal_uInt32 getPrimitive2DID() const override;
-
-            /// Override standard getDecomposition call to be view-dependent here
-            virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
-        };
-    } // end of namespace primitive2d
+namespace primitive2d
+{
+/** BackgroundColorPrimitive2D class
+
+    This primitive is defined to fill the whole visible Viewport with
+    the given color (and thus decomposes to a filled polygon). This
+    makes it a view-dependent primitive by definition. It only has
+    a valid decomposition if a valid Viewport is given in the
+    ViewInformation2D at decomposition time.
+
+    It will try to buffer its last decomposition using maLastViewport
+    to detect changes in the get2DDecomposition call.
+ */
+class DRAWINGLAYER_DLLPUBLIC BackgroundColorPrimitive2D final
+    : public BufferedDecompositionPrimitive2D
+{
+private:
+    /// the fill color to use
+    basegfx::BColor maBColor;
+    double mfTransparency;
+
+    /// the last used viewInformation, used from getDecomposition for buffering
+    basegfx::B2DRange maLastViewport;
+
+    /// create local decomposition
+    virtual void
+    create2DDecomposition(Primitive2DContainer& rContainer,
+                          const geometry::ViewInformation2D& rViewInformation) const override;
+
+public:
+    /// constructor
+    explicit BackgroundColorPrimitive2D(const basegfx::BColor& rBColor, double fTransparency = 0);
+
+    /// data read access
+    const basegfx::BColor& getBColor() const { return maBColor; }
+    double getTransparency() const { return mfTransparency; }
+
+    /// compare operator
+    virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
+
+    /// get B2Drange
+    virtual basegfx::B2DRange
+    getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
+
+    /// provide unique ID
+    virtual sal_uInt32 getPrimitive2DID() const override;
+
+    /// Override standard getDecomposition call to be view-dependent here
+    virtual void
+    get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor,
+                       const geometry::ViewInformation2D& rViewInformation) const override;
+};
+} // end of namespace primitive2d
 } // end of namespace drawinglayer
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 8fe9cb97ea2e..b94ad4e56d9d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6049,7 +6049,6 @@ include/drawinglayer/attribute/strokeattribute.hxx
 include/drawinglayer/drawinglayerdllapi.h
 include/drawinglayer/geometry/viewinformation2d.hxx
 include/drawinglayer/geometry/viewinformation3d.hxx
-include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
 include/drawinglayer/primitive2d/controlprimitive2d.hxx
 include/drawinglayer/primitive2d/cropprimitive2d.hxx