[Libreoffice-commits] core.git: include/drawinglayer solenv/clang-format
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Tue Feb 4 07:38:51 UTC 2020
include/drawinglayer/primitive2d/controlprimitive2d.hxx | 152 ++++++++--------
solenv/clang-format/blacklist | 1
2 files changed, 82 insertions(+), 71 deletions(-)
New commits:
commit d487e1826bc177742aa8563f855c4b0bee49a705
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Feb 3 19:39:33 2020 +0100
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Tue Feb 4 08:38:09 2020 +0100
remove controlprimitive2d.hxx from clang-format blacklist
Change-Id: I8918f8c9e4f27a287c98dadd51a11acf3338daa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87942
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
index 29ac5a343f92..85686de5a453 100644
--- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx
@@ -24,84 +24,96 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-namespace com::sun::star::awt { class XControl; }
-namespace com::sun::star::awt { class XControlModel; }
-
+namespace com::sun::star::awt
+{
+class XControl;
+}
+namespace com::sun::star::awt
+{
+class XControlModel;
+}
namespace drawinglayer
{
- namespace primitive2d
- {
- /** ControlPrimitive2D class
-
- Base class for ControlPrimitive handling. It decomposes to a
- graphical representation (Bitmap data) of the control. This
- representation is limited to a quadratic pixel maximum defined
- in the application settings.
- */
- class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D final : public BufferedDecompositionPrimitive2D
- {
- private:
- /// object's base data
- basegfx::B2DHomMatrix maTransform;
- css::uno::Reference< css::awt::XControlModel > mxControlModel;
-
- /// the created and cached awt::XControl
- css::uno::Reference< css::awt::XControl > mxXControl;
-
- /// the last used scaling, used from getDecomposition for buffering
- basegfx::B2DVector maLastViewScaling;
-
- /** used from getXControl() to create a local awt::XControl which is remembered in mxXControl
- and from thereon always used and returned by getXControl()
- */
- void createXControl();
+namespace primitive2d
+{
+/** ControlPrimitive2D class
- /// single local decompositions, used from create2DDecomposition()
- Primitive2DReference createBitmapDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
- Primitive2DReference createPlaceholderDecomposition() const;
+ Base class for ControlPrimitive handling. It decomposes to a
+ graphical representation (Bitmap data) of the control. This
+ representation is limited to a quadratic pixel maximum defined
+ in the application settings.
+ */
+class DRAWINGLAYER_DLLPUBLIC ControlPrimitive2D final : public BufferedDecompositionPrimitive2D
+{
+private:
+ /// object's base data
+ basegfx::B2DHomMatrix maTransform;
+ css::uno::Reference<css::awt::XControlModel> mxControlModel;
- /// local decomposition
- virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override;
+ /// the created and cached awt::XControl
+ css::uno::Reference<css::awt::XControl> mxXControl;
- public:
- /// constructor
- ControlPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
- const css::uno::Reference< css::awt::XControlModel >& rxControlModel);
+ /// the last used scaling, used from getDecomposition for buffering
+ basegfx::B2DVector maLastViewScaling;
- /** constructor with an additional XControl as parameter to allow to hand it over at incarnation time
- if it exists. This will avoid to create a 2nd one on demand in createXControl()
- and thus double the XControls.
- */
- ControlPrimitive2D(
- const basegfx::B2DHomMatrix& rTransform,
- const css::uno::Reference< css::awt::XControlModel >& rxControlModel,
- const css::uno::Reference< css::awt::XControl >& rxXControl);
-
- /// data read access
- const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
- const css::uno::Reference< css::awt::XControlModel >& getControlModel() const { return mxControlModel; }
-
- /** mxControl access. This will on demand create the awt::XControl using createXControl()
- if it does not exist. It may already have been created or even handed over at
- incarnation
+ /** used from getXControl() to create a local awt::XControl which is remembered in mxXControl
+ and from thereon always used and returned by getXControl()
*/
- const css::uno::Reference< css::awt::XControl >& getXControl() const;
-
- /// compare operator
- virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
-
- /// get range
- virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
-
- /// provide unique ID
- virtual sal_uInt32 getPrimitive2DID() const override;
-
- /// Override standard getDecomposition to be view-dependent here
- virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override;
- };
- } // end of namespace primitive2d
+ void createXControl();
+
+ /// single local decompositions, used from create2DDecomposition()
+ Primitive2DReference
+ createBitmapDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
+ Primitive2DReference createPlaceholderDecomposition() const;
+
+ /// local decomposition
+ virtual void
+ create2DDecomposition(Primitive2DContainer& rContainer,
+ const geometry::ViewInformation2D& rViewInformation) const override;
+
+public:
+ /// constructor
+ ControlPrimitive2D(const basegfx::B2DHomMatrix& rTransform,
+ const css::uno::Reference<css::awt::XControlModel>& rxControlModel);
+
+ /** constructor with an additional XControl as parameter to allow to hand it over at incarnation time
+ if it exists. This will avoid to create a 2nd one on demand in createXControl()
+ and thus double the XControls.
+ */
+ ControlPrimitive2D(const basegfx::B2DHomMatrix& rTransform,
+ const css::uno::Reference<css::awt::XControlModel>& rxControlModel,
+ const css::uno::Reference<css::awt::XControl>& rxXControl);
+
+ /// data read access
+ const basegfx::B2DHomMatrix& getTransform() const { return maTransform; }
+ const css::uno::Reference<css::awt::XControlModel>& getControlModel() const
+ {
+ return mxControlModel;
+ }
+
+ /** mxControl access. This will on demand create the awt::XControl using createXControl()
+ if it does not exist. It may already have been created or even handed over at
+ incarnation
+ */
+ const css::uno::Reference<css::awt::XControl>& getXControl() const;
+
+ /// compare operator
+ virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
+
+ /// get range
+ virtual basegfx::B2DRange
+ getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
+
+ /// provide unique ID
+ virtual sal_uInt32 getPrimitive2DID() const override;
+
+ /// Override standard getDecomposition 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 b95748716f84..789204888ac0 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/controlprimitive2d.hxx
include/drawinglayer/primitive2d/cropprimitive2d.hxx
include/drawinglayer/primitive2d/discretebitmapprimitive2d.hxx
include/drawinglayer/primitive2d/discreteshadowprimitive2d.hxx
More information about the Libreoffice-commits
mailing list