drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx | 11 -
drawinglayer/inc/texture/texture.hxx | 98 +-------------
include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx | 12 -
include/drawinglayer/primitive2d/polygonprimitive2d.hxx | 2
include/drawinglayer/primitive2d/primitivetools2d.hxx | 28 ----
5 files changed, 20 insertions(+), 131 deletions(-)
New commits:
commit 5efee256af8ae6270ba194da3d5beaebf58493e6
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 20:43:38 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 20:43:38 2020 +0200
drawinglayer: externalize classes in texture.hxx
Change-Id: I1e49a6c896733ebebf16db23f3c2f8b06161d659
diff --git a/drawinglayer/inc/texture/texture.hxx
b/drawinglayer/inc/texture/texture.hxx
index 24e23a4b241c..b34bde38d1bc 100644
--- a/drawinglayer/inc/texture/texture.hxx
+++ b/drawinglayer/inc/texture/texture.hxx
@@ -30,7 +30,7 @@
namespace drawinglayer::texture
{
- class GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvx
{
public:
GeoTexSvx();
@@ -53,7 +53,7 @@ namespace drawinglayer::texture
basegfx::BColor maBColor;
};
- class GeoTexSvxGradient : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradient : public GeoTexSvx
{
protected:
basegfx::ODFGradientInfo maGradientInfo;
@@ -79,7 +79,7 @@ namespace drawinglayer::texture
basegfx::BColor& rOuterColor) = 0;
};
- class GeoTexSvxGradientLinear final : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientLinear final : public
GeoTexSvxGradient
{
double mfUnitMinX;
double mfUnitWidth;
@@ -102,7 +102,7 @@ namespace drawinglayer::texture
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- class GeoTexSvxGradientAxial final : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientAxial final : public
GeoTexSvxGradient
{
double mfUnitMinX;
double mfUnitWidth;
@@ -124,7 +124,7 @@ namespace drawinglayer::texture
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- class GeoTexSvxGradientRadial final : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRadial final : public
GeoTexSvxGradient
{
public:
GeoTexSvxGradientRadial(
@@ -143,7 +143,7 @@ namespace drawinglayer::texture
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- class GeoTexSvxGradientElliptical final : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientElliptical final :
public GeoTexSvxGradient
{
public:
GeoTexSvxGradientElliptical(
@@ -163,7 +163,7 @@ namespace drawinglayer::texture
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- class GeoTexSvxGradientSquare final : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientSquare final : public
GeoTexSvxGradient
{
public:
GeoTexSvxGradientSquare(
@@ -183,7 +183,7 @@ namespace drawinglayer::texture
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- class GeoTexSvxGradientRect final : public GeoTexSvxGradient
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxGradientRect final : public
GeoTexSvxGradient
{
public:
GeoTexSvxGradientRect(
@@ -203,7 +203,7 @@ namespace drawinglayer::texture
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- class GeoTexSvxHatch final : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxHatch final : public GeoTexSvx
{
basegfx::B2DRange maOutputRange;
basegfx::B2DHomMatrix maTextureTransform;
@@ -239,7 +239,7 @@ namespace drawinglayer::texture
// given percentage value (offsetX has to be 0.0 <= offsetX <= 1.0).
// Accordingly to offsetY. If both are given, offsetX is preferred
// and offsetY is ignored.
- class GeoTexSvxTiled final : public GeoTexSvx
+ class DRAWINGLAYER_DLLPUBLIC GeoTexSvxTiled final : public GeoTexSvx
{
basegfx::B2DRange maRange;
double mfOffsetX;
commit 90f64460d2c36f59675e484243d30f089a933b3b
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 20:40:59 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 20:40:59 2020 +0200
drawinglayer: externalize FillHatchPrimitive2D class
Change-Id: I9ad1f179a43bb6c501cb699c0f26523f47307829
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index bab7e47b03e8..c7b3a559bc42 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -26,9 +26,6 @@
#include <drawinglayer/attribute/fillhatchattribute.hxx>
#include <basegfx/color/bcolor.hxx>
-
-// FillHatchPrimitive2D class
-
namespace drawinglayer::primitive2d
{
/** FillHatchPrimitive2D class
@@ -45,7 +42,7 @@ namespace drawinglayer::primitive2d
The decomposition will deliver the hatch lines.
*/
- class FillHatchPrimitive2D final : public
DiscreteMetricDependentPrimitive2D
+ class DRAWINGLAYER_DLLPUBLIC FillHatchPrimitive2D final : public
DiscreteMetricDependentPrimitive2D
{
private:
/// the geometrically visible area
commit 474f1cf752f4a69fc2f1aa61122cbc5dc01c22ba
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 20:39:57 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 20:39:57 2020 +0200
drawinglayer: clean-up namespaces in fillhatchprimitive2d.hxx
Change-Id: I6fdd777cb9e238d43abdc5ec30bd998ae611caa9
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index 4b741cef44d6..bab7e47b03e8 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -29,10 +29,8 @@
// FillHatchPrimitive2D class
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
/** FillHatchPrimitive2D class
This class defines a hatch filling for a rectangular area. The
@@ -96,7 +94,6 @@ namespace drawinglayer
/// provide unique ID
virtual sal_uInt32 getPrimitive2DID() const override;
};
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 26a78f9514e558e5f231368e158ff1fdf4e573e9
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 20:38:10 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 20:38:10 2020 +0200
drawinglayer: clean-up namespaces in graphicprimitivehelper2d.hxx
Change-Id: I24b11ccc7d82a9d3380fc8aa32c90ad0256485f9
diff --git a/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
index cd1cc99ebf51..fb1431152b16 100644
--- a/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
+++ b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
@@ -22,16 +22,10 @@
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <vcl/GraphicObject.hxx>
-
-// predefines
-
class Graphic;
-
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
/** Helper method with supports decomposing a Graphic with all
possible contents to lower level primitives.
@@ -60,7 +54,6 @@ namespace drawinglayer
double fGamma = 1.0, // ]0.0 .. 10.0]
bool bInvert = false);
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f7223ce0021741493608024355ac47b7e5c1568b
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 20:37:06 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 20:37:06 2020 +0200
drawinglayer: clean-up namespaces in primitivetools2d.hxx
Change-Id: I766c5deba22f93824b5c13908a549ea0980c3aa7
diff --git a/include/drawinglayer/primitive2d/primitivetools2d.hxx
b/include/drawinglayer/primitive2d/primitivetools2d.hxx
index 8a368ae301c0..db22a59b0eee 100644
--- a/include/drawinglayer/primitive2d/primitivetools2d.hxx
+++ b/include/drawinglayer/primitive2d/primitivetools2d.hxx
@@ -25,10 +25,8 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
-namespace drawinglayer
+namespace drawinglayer::primitive2d
{
- namespace primitive2d
- {
/** DiscreteMetricDependentPrimitive2D class
tooling class for BufferedDecompositionPrimitive2D based classes
which are view-dependent
@@ -59,14 +57,7 @@ namespace drawinglayer
/// 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
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
/** ViewportDependentPrimitive2D class
tooling class for BufferedDecompositionPrimitive2D based classes
which are view-dependent
@@ -97,14 +88,7 @@ namespace drawinglayer
/// 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
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
/** ViewTransformationDependentPrimitive2D class
tooling class for BufferedDecompositionPrimitive2D based classes
which are view-dependent
@@ -135,14 +119,7 @@ namespace drawinglayer
/// 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
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
/** ObjectAndViewTransformationDependentPrimitive2D class
tooling class for BufferedDecompositionPrimitive2D based classes
which are view-dependent
@@ -177,7 +154,6 @@ namespace drawinglayer
/// 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
+} // end of namespace drawinglayer::primitive2d
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit edb6fc32837501a88622d0b60d17dd9e73413540
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 20:32:06 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 20:32:06 2020 +0200
drawinglayer: clean-up namespaces in texture.hxx
Change-Id: I0977858ea5b9d2b7ddfaa8012ef50170ee02f27d
diff --git a/drawinglayer/inc/texture/texture.hxx
b/drawinglayer/inc/texture/texture.hxx
index 64595a46222c..24e23a4b241c 100644
--- a/drawinglayer/inc/texture/texture.hxx
+++ b/drawinglayer/inc/texture/texture.hxx
@@ -28,11 +28,8 @@
#include <vector>
#include <functional>
-
-namespace drawinglayer
+namespace drawinglayer::texture
{
- namespace texture
- {
class GeoTexSvx
{
public:
@@ -47,14 +44,7 @@ namespace drawinglayer
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const;
virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double&
rfOpacity) const;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
/// helper class for processing equal number of matrices and colors
/// for texture processing
struct B2DHomMatrixAndBColor
@@ -62,14 +52,7 @@ namespace drawinglayer
basegfx::B2DHomMatrix maB2DHomMatrix;
basegfx::BColor maBColor;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradient : public GeoTexSvx
{
protected:
@@ -95,14 +78,7 @@ namespace drawinglayer
std::vector< B2DHomMatrixAndBColor >& rEntries,
basegfx::BColor& rOuterColor) = 0;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradientLinear final : public GeoTexSvxGradient
{
double mfUnitMinX;
@@ -125,14 +101,7 @@ namespace drawinglayer
basegfx::BColor& rOuterColor) override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradientAxial final : public GeoTexSvxGradient
{
double mfUnitMinX;
@@ -154,14 +123,7 @@ namespace drawinglayer
basegfx::BColor& rOuterColor) override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradientRadial final : public GeoTexSvxGradient
{
public:
@@ -180,14 +142,7 @@ namespace drawinglayer
basegfx::BColor& rOuterColor) override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradientElliptical final : public GeoTexSvxGradient
{
public:
@@ -207,14 +162,7 @@ namespace drawinglayer
basegfx::BColor& rOuterColor) override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradientSquare final : public GeoTexSvxGradient
{
public:
@@ -234,14 +182,7 @@ namespace drawinglayer
basegfx::BColor& rOuterColor) override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxGradientRect final : public GeoTexSvxGradient
{
public:
@@ -261,14 +202,7 @@ namespace drawinglayer
basegfx::BColor& rOuterColor) override;
virtual void modifyBColor(const basegfx::B2DPoint& rUV,
basegfx::BColor& rBColor, double& rfOpacity) const override;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
class GeoTexSvxHatch final : public GeoTexSvx
{
basegfx::B2DRange maOutputRange;
@@ -295,14 +229,7 @@ namespace drawinglayer
double getDistanceToHatch(const basegfx::B2DPoint& rUV) const;
const basegfx::B2DHomMatrix& getBackTextureTransform() const;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
-
-namespace drawinglayer
-{
- namespace texture
- {
// This class applies a tiling to the unit range. The given range
// will be repeated inside the unit range in X and Y and for each
// tile a matrix will be created (by appendTransformations) that
@@ -334,8 +261,7 @@ namespace drawinglayer
void appendTransformations(::std::vector< basegfx::B2DHomMatrix >&
rMatrices) const;
sal_uInt32 getNumberOfTiles() const;
};
- } // end of namespace texture
-} // end of namespace drawinglayer
+} // end of namespace drawinglayer::texture
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d3536acba6cc108111e789c6d6dad61ce737a163
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Fri May 8 17:09:05 2020 +0200
Commit: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
CommitDate: Fri May 8 17:09:05 2020 +0200
drawinglayer: externalize PolygonWavePrimitive2D class
Change-Id: Ib611d55864310d1fade1bee9618f7e1a11587d5e
diff --git a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
index ac56461e35b0..01caf9885cca 100644
--- a/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -180,7 +180,7 @@ public:
This primitive defines a waveline based on a PolygonStrokePrimitive2D
where the wave is defined by wave width and wave length.
*/
-class PolygonWavePrimitive2D final : public PolygonStrokePrimitive2D
+class DRAWINGLAYER_DLLPUBLIC PolygonWavePrimitive2D final : public
PolygonStrokePrimitive2D
{
private:
/// wave definition
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
