[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer

[Armin Le Grand (allotropia) (via logerrit)]

 drawinglayer/inc/texture/texture.hxx |   29 -
 drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx  |  255 +--
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx  |   84 +++
 drawinglayer/source/texture/texture.cxx  |   92 +--
 include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx |   21 
 5 files changed, 247 insertions(+), 234 deletions(-)

New commits:
commit 462ebbd10bd537f42104fe991a0aeebcd563f178
Author: Armin Le Grand (allotropia) 
AuthorDate: Thu Mar 23 16:13:26 2023 +0100
Commit: Armin Le Grand 
CommitDate: Thu Mar 23 17:14:04 2023 +

MCGR: Speedup Gradient Paint for VCLPixelProcessor

To do this, I re-organized FillGradientPrimitive2D and
how it creates it's decompose. This provides the needed
tooling to also do a more direct rendering in primitive
processors if needed.

The decompose no longer collects the matrices & colors
as a 1st step in a helper data struecture (so I removed
B2DHomMatrixAndBColor). It now uses a lambda function
callback that hands over the matrix & color for each
created step, so you can process it directly, in this
case to create the needed primitives.

NOTE: The decompositions are both tested. There was
createNonOverlappingFill, but also createOverlappingFill
that I am not sure is still used - and if in re-creating
an old, strange XOR-using gradient paint mechanism in
old metafiles (encapsulated with gradient info anyways),
but I converted that and made sure it works.
To do so I forced it to be used in paint. This is not
really usable in paint since we need to paint using AA
(else we would get staircase effects, esp. in new 'hard'
color changes in multi-color gradients) and - as should
be known - same edges painted in AA do *not* add up to
full opacity, but leave behind awful 'jaggies' (e.g.
opacity 0.5 and 0.5 create 0.75 and *not* 1.0). Still
important to have the working geometry creation for this
case.

This already makes the decompose faster, but the main
purpose is to use it as tooling for painting in own
primitive renderers.

Thus processFillGradientPrimitive2D now uses that
instead of using the decomposition by default.
This avoids one level of primitive creation, use
that new FillGradientPrimitive2D tooling to directly
create needed geoemtry & color for getting better
performance (to partially compensate for potentially
more expensive multi color gradients). It then paints
directly using OutputDevice calls.

NOTE: This can also be used in SDPRs as a 1st step
to just directly and rapidly render filled single-
color polygons, but of course there an implementation
using the back-transformations (which are also
adapted for MCGRs aleady and work) will be superior.

Change-Id: I5079f76d6d8fe86007a098614c276447f2bfebce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149456
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/drawinglayer/inc/texture/texture.hxx 
b/drawinglayer/inc/texture/texture.hxx
index 8a5c411d320f..54ace6ba3b47 100644
--- a/drawinglayer/inc/texture/texture.hxx
+++ b/drawinglayer/inc/texture/texture.hxx
@@ -43,14 +43,6 @@ namespace drawinglayer::texture
 virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& 
rfOpacity) const;
 };
 
-/// helper class for processing equal number of matrices and colors
-/// for texture processing
-struct B2DHomMatrixAndBColor
-{
-basegfx::B2DHomMatrix   maB2DHomMatrix;
-basegfx::BColor maBColor;
-};
-
 class GeoTexSvxGradient : public GeoTexSvx
 {
 protected:
@@ -76,8 +68,7 @@ namespace drawinglayer::texture
 
 // virtual base methods
 virtual void appendTransformationsAndColors(
-std::vector< B2DHomMatrixAndBColor >& rEntries,
-basegfx::BColor& rOuterColor) = 0;
+std::function aCallback) = 0;
 };
 
 class GeoTexSvxGradientLinear final : public GeoTexSvxGradient
@@ -97,8 +88,7 @@ namespace drawinglayer::texture
 virtual ~GeoTexSvxGradientLinear() override;
 
 virtual void appendTransformationsAndColors(
-std::vector< B2DHomMatrixAndBColor >& rEntries,
-basegfx::BColor& rOuterColor) override;
+std::function aCallback) override;
 virtual void modifyBColor(const basegfx::B2DPoint& rUV, 
basegfx::BColor& rBColor, double& rfOpacity) const override;
 };
 
@@ -118,8 +108,7 @@ namespace drawinglayer::texture
 virtual ~GeoTexSvxGradientAxial() override;
 
 virtual void appendTransformationsAndColors(
-std::vector< B2DHomMatrixAndBColor >& rEntries,
-

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer

[Noel Grandin (via logerrit)]

 drawinglayer/inc/primitive2d/cropprimitive2d.hxx |2 
 drawinglayer/inc/primitive2d/textlineprimitive2d.hxx |2 
 drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx|6 +-
 drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx |2 
 drawinglayer/inc/primitive3d/shadowprimitive3d.hxx   |2 
 drawinglayer/inc/primitive3d/textureprimitive3d.hxx  |2 
 drawinglayer/inc/processor3d/geometry2dextractor.hxx |2 
 drawinglayer/inc/processor3d/shadow3dextractor.hxx   |2 
 drawinglayer/source/attribute/fillgraphicattribute.cxx   |5 +-
 drawinglayer/source/attribute/fontattribute.cxx  |   11 
++--
 drawinglayer/source/attribute/linestartendattribute.cxx  |5 +-
 drawinglayer/source/attribute/sdrallattribute3d.cxx  |   21 
-
 drawinglayer/source/attribute/sdrfillattribute.cxx   |   13 
+++--
 drawinglayer/source/attribute/sdrfillgraphicattribute.cxx|5 +-
 drawinglayer/source/attribute/sdrlinestartendattribute.cxx   |9 ++-
 drawinglayer/source/geometry/viewinformation2d.cxx   |   13 
+++--
 drawinglayer/source/geometry/viewinformation3d.cxx   |   17 
+++
 drawinglayer/source/primitive2d/PolyPolygonColorPrimitive2D.cxx  |7 +--
 drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx   |   14 
+++---
 drawinglayer/source/primitive2d/PolyPolygonGraphicPrimitive2D.cxx|5 +-
 drawinglayer/source/primitive2d/PolyPolygonHairlinePrimitive2D.cxx   |7 +--
 drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx  |   16 
+++---
 drawinglayer/source/primitive2d/PolyPolygonMarkerPrimitive2D.cxx |   10 
++--
 drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx  |7 +--
 drawinglayer/source/primitive2d/PolyPolygonStrokePrimitive2D.cxx |   13 
+++--
 drawinglayer/source/primitive2d/bitmapprimitive2d.cxx|9 ++-
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx|5 +-
 drawinglayer/source/primitive2d/controlprimitive2d.cxx   |   21 
-
 drawinglayer/source/primitive2d/cropprimitive2d.cxx  |5 +-
 drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx|9 ++-
 drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx|   13 
+++--
 drawinglayer/source/primitive2d/epsprimitive2d.cxx   |9 ++-
 drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx  |9 ++-
 drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx   |5 +-
 drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx |9 ++-
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx   |9 ++-
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |7 +--
 drawinglayer/source/primitive2d/gridprimitive2d.cxx  |5 +-
 drawinglayer/source/primitive2d/maskprimitive2d.cxx  |5 +-
 drawinglayer/source/primitive2d/mediaprimitive2d.cxx |   13 
+++--
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx  |5 +-
 drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx |5 +-
 drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx|   13 
+++--
 drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx   |9 ++-
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |5 +-
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx   |   23 
+-
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx |   21 
-
 drawinglayer/source/primitive2d/shadowprimitive2d.cxx|5 +-
 drawinglayer/source/primitive2d/svggradientprimitive2d.cxx   |9 ++-
 drawinglayer/source/primitive2d/textlineprimitive2d.cxx  |5 +-
 drawinglayer/source/primitive2d/textprimitive2d.cxx  |   18 
+++
 drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx |   13 
+++--
 drawinglayer/source/primitive2d/transformprimitive2d.cxx |5 +-
 drawinglayer/source/primitive2d/wrongspellprimitive2d.cxx|5 +-
 drawinglayer/source/primitive3d/groupprimitive3d.cxx |5 +-
 drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx  |5 +-
 drawinglayer/source/primitive3d/modifiedcolorprimitive3d.cxx |5 +-
 drawinglayer/source/primitive3d/polygonprimitive3d.cxx   |   13 
+++--
 drawinglayer/source/primitive3d/polypolygonprimitive3d.cxx   |5 +-
 drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx|5 +-
 drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx  |5 +-
 

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer include/svx sd/source svgio/inc svgio/source svx/inc svx/source sw/source

[Noel Grandin (via logerrit)]

 drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx|2 
 drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx   |2 
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx |4 
 drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx   |4 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |4 
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx |4 
 drawinglayer/source/primitive2d/texteffectprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/textprimitive2d.cxx  |4 
 include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/patternfillprimitive2d.hxx  |2 
 include/svx/sdr/animation/animationstate.hxx |2 
 include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx |2 
 include/svx/svddrgmt.hxx |3 
 sd/source/ui/animations/motionpathtag.cxx|2 
 svgio/inc/svgstyleattributes.hxx |4 
 svgio/inc/svgtextnode.hxx|2 
 svgio/source/svgreader/svganode.cxx  |2 
 svgio/source/svgreader/svgcirclenode.cxx |2 
 svgio/source/svgreader/svgellipsenode.cxx|2 
 svgio/source/svgreader/svggnode.cxx  |2 
 svgio/source/svgreader/svgimagenode.cxx  |2 
 svgio/source/svgreader/svglinenode.cxx   |2 
 svgio/source/svgreader/svgpathnode.cxx   |2 
 svgio/source/svgreader/svgpolynode.cxx   |2 
 svgio/source/svgreader/svgrectnode.cxx   |2 
 svgio/source/svgreader/svgstyleattributes.cxx|   10 
 svgio/source/svgreader/svgtextnode.cxx   |   16 -
 svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx|4 
 svx/inc/sdr/primitive2d/sdrole2primitive2d.hxx   |2 
 svx/source/engine3d/view3d.cxx   |2 
 svx/source/sdr/animation/animationstate.cxx  |4 
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx|2 
 svx/source/sdr/contact/viewobjectcontact.cxx |3 
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx|2 
 svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx  |4 
 svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx |2 
 svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx   |2 
 svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx |8 
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |  166 +--
 svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx |4 
 svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx|6 
 svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx |2 
 svx/source/sdr/primitive2d/sdrole2primitive2d.cxx|6 
 svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx|2 
 svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx   |2 
 svx/source/svdraw/svdcrtv.cxx|2 
 svx/source/svdraw/svddrgmt.cxx   |8 
 svx/source/svdraw/svdhdl.cxx |2 
 svx/source/table/viewcontactoftableobj.cxx   |4 
 sw/source/core/layout/paintfrm.cxx   |   10 
 52 files changed, 169 insertions(+), 175 deletions(-)

New commits:
commit c8d2fa176a15a7ae76d6a4b76aea5f108313c2ec
Author: Noel Grandin 
AuthorDate: Thu Sep 23 15:35:34 2021 +0200
Commit: Noel Grandin 
CommitDate: Fri Sep 24 11:33:32 2021 +0200

reduce copying in drawinglayer

by passing PrimitiveContainer&& around.

There are lots of place where we were preparing a local variable of type
PrimitiveContainer, and then copying it someplace else, then throwing it
away.

Change-Id: Iacfd983640c9e55da25800ccc01734dfc8b4d64a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122527
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx 
b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
index 001ff3159305..cecb1d8f1564 100644
--- a/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
+++ b/drawinglayer/inc/primitive2d/graphicprimitivehelper2d.hxx
@@ -44,7 +44,7 @@ namespace drawinglayer::primitive2d
 applied.
 */
 Primitive2DContainer create2DColorModifierEmbeddingsAsNeeded(
-const Primitive2DContainer& rChildren,
+Primitive2DContainer&& rChildren,
 GraphicDrawMode aGraphicDrawMode,
 double fLuminance = 0.0,// 

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer sd/source svgio/source svx/inc svx/source sw/source

[Noel Grandin (via logerrit)]

 drawinglayer/inc/primitive2d/cropprimitive2d.hxx|2 
 drawinglayer/source/primitive2d/PolyPolygonGradientPrimitive2D.cxx  |4 
 drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx |4 
 drawinglayer/source/primitive2d/PolyPolygonSelectionPrimitive2D.cxx |2 
 drawinglayer/source/primitive2d/animatedprimitive2d.cxx |   14 +-
 drawinglayer/source/primitive2d/cropprimitive2d.cxx |6 -
 drawinglayer/source/primitive2d/discreteshadowprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/glowprimitive2d.cxx |4 
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx  |   15 +-
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx|   14 +-
 drawinglayer/source/primitive2d/groupprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/hiddengeometryprimitive2d.cxx   |4 
 drawinglayer/source/primitive2d/invertprimitive2d.cxx   |4 
 drawinglayer/source/primitive2d/maskprimitive2d.cxx |4 
 drawinglayer/source/primitive2d/mediaprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |4 
 drawinglayer/source/primitive2d/modifiedcolorprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/objectinfoprimitive2d.cxx   |4 
 drawinglayer/source/primitive2d/pagehierarchyprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/pagepreviewprimitive2d.cxx  |4 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx  |   22 ++--
 drawinglayer/source/primitive2d/shadowprimitive2d.cxx   |   10 -
 drawinglayer/source/primitive2d/softedgeprimitive2d.cxx |7 -
 drawinglayer/source/primitive2d/structuretagprimitive2d.cxx |4 
 drawinglayer/source/primitive2d/svggradientprimitive2d.cxx  |   14 +-
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/texteffectprimitive2d.cxx   |   42 
---
 drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx|   24 ++--
 drawinglayer/source/primitive2d/textlineprimitive2d.cxx |4 
 drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/transformprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/transparenceprimitive2d.cxx |8 -
 drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx  |6 -
 drawinglayer/source/processor3d/shadow3dextractor.cxx   |6 -
 drawinglayer/source/tools/converters.cxx|8 -
 drawinglayer/source/tools/wmfemfhelper.cxx  |   32 
++---
 include/drawinglayer/primitive2d/animatedprimitive2d.hxx|6 -
 include/drawinglayer/primitive2d/glowprimitive2d.hxx|2 
 include/drawinglayer/primitive2d/groupprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/invertprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/maskprimitive2d.hxx|2 
 include/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/objectinfoprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/shadowprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/softedgeprimitive2d.hxx|2 
 include/drawinglayer/primitive2d/structuretagprimitive2d.hxx|2 
 include/drawinglayer/primitive2d/texthierarchyprimitive2d.hxx   |   12 +-
 include/drawinglayer/primitive2d/transformprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/transparenceprimitive2d.hxx|4 
 include/drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx |2 
 sd/source/ui/unoidl/unomodel.cxx|4 
 svgio/source/svgreader/svgclippathnode.cxx  |6 -
 svgio/source/svgreader/svgimagenode.cxx |4 
 svgio/source/svgreader/svgmasknode.cxx  |   20 +--
 svgio/source/svgreader/svgnode.cxx  |4 
 svgio/source/svgreader/svgstyleattributes.cxx   |   16 +-
 svgio/source/svgreader/svgsvgnode.cxx   |   12 +-
 svgio/source/svgreader/svgusenode.cxx   |2 
 svx/inc/sdr/primitive2d/sdrdecompositiontools.hxx   |2 
 svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx  |2 
 svx/source/engine3d/view3d.cxx  |4 
 

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer include/svx svx/inc svx/source sw/source

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx|2 
 drawinglayer/inc/primitive2d/textlineprimitive2d.hxx  |2 
 drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx |2 
 drawinglayer/source/primitive2d/baseprimitive2d.cxx   |2 
 include/drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx |  106 
++
 include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx  |3 
 include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx   |3 
 include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx|3 
 include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx   |2 
 include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx  |3 
 include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx |2 
 include/drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx  |3 
 include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx |2 
 include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/baseprimitive2d.hxx  |   74 
--
 include/drawinglayer/primitive2d/bitmapprimitive2d.hxx|1 
 include/drawinglayer/primitive2d/borderlineprimitive2d.hxx|2 
 include/drawinglayer/primitive2d/controlprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/embedded3dprimitive2d.hxx|2 
 include/drawinglayer/primitive2d/epsprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/fillgraphicprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/graphicprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/gridprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/groupprimitive2d.hxx |2 
 include/drawinglayer/primitive2d/helplineprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/mediaprimitive2d.hxx |2 
 include/drawinglayer/primitive2d/metafileprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/patternfillprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/polygonprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/primitivetools2d.hxx |2 
 include/drawinglayer/primitive2d/sceneprimitive2d.hxx |2 
 include/drawinglayer/primitive2d/svggradientprimitive2d.hxx   |2 
 include/drawinglayer/primitive2d/textprimitive2d.hxx  |2 
 include/drawinglayer/primitive2d/wrongspellprimitive2d.hxx|2 
 include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx |2 
 svx/inc/sdr/primitive2d/sdrcaptionprimitive2d.hxx |2 
 svx/inc/sdr/primitive2d/sdrconnectorprimitive2d.hxx   |2 
 svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx |2 
 svx/inc/sdr/primitive2d/sdrellipseprimitive2d.hxx |2 
 svx/inc/sdr/primitive2d/sdrgrafprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrmeasureprimitive2d.hxx |2 
 svx/inc/sdr/primitive2d/sdrolecontentprimitive2d.hxx  |2 
 svx/inc/sdr/primitive2d/sdrpathprimitive2d.hxx|2 
 svx/inc/sdr/primitive2d/sdrrectangleprimitive2d.hxx   |2 
 svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx|2 
 svx/source/table/viewcontactoftableobj.cxx|1 
 sw/source/core/draw/dflyobj.cxx   |2 
 50 files changed, 163 insertions(+), 116 deletions(-)

New commits:
commit 7e478166361248c3f3c923b9f0d18dc25d30ef15
Author: Tomaž Vajngerl 
AuthorDate: Sun Jun 20 23:52:32 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Mon Jun 21 02:22:32 2021 +0200

drawinglayer: put BufferedDecompositionPrimitive2D in its own file

And fix includes all over the place...

Change-Id: I6e2696bbeeac6ab7467cac70545fa7209aa981a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117528
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx 
b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx
index 45a21f67dab8..ce62b3110199 100644
--- a/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx
+++ b/drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include 
+#include 
 #include 
 
 namespace drawinglayer::primitive2d
diff --git a/drawinglayer/inc/primitive2d/textlineprimitive2d.hxx 

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |2 +-
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |2 +-
 drawinglayer/source/tools/converters.cxx |2 +-
 include/drawinglayer/converters.hxx  |   10 --
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 1bcad85a5d48cc38ced5883de364f2c66ada273e
Author: Tomaž Vajngerl 
AuthorDate: Mon May 3 23:21:18 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Tue May 11 01:16:23 2021 +0200

drawinglayer: move converter.hxx to public include

Change-Id: I71a15c532ba161d69585bd47631b3a8e2f6ddd66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115304
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 66b29591df7e..2f750e73af65 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -33,7 +33,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 using namespace ::com::sun::star;
 
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx 
b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index ec1f9621452a..0e5b1a218690 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 using namespace com::sun::star;
 
diff --git a/drawinglayer/source/tools/converters.cxx 
b/drawinglayer/source/tools/converters.cxx
index 6a963748161f..d8fe291bf803 100644
--- a/drawinglayer/source/tools/converters.cxx
+++ b/drawinglayer/source/tools/converters.cxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #ifdef DBG_UTIL
 #include 
diff --git a/drawinglayer/inc/converters.hxx 
b/include/drawinglayer/converters.hxx
similarity index 79%
rename from drawinglayer/inc/converters.hxx
rename to include/drawinglayer/converters.hxx
index 5e4e8a49bdb5..64d0e2ce7d4e 100644
--- a/drawinglayer/inc/converters.hxx
+++ b/include/drawinglayer/converters.hxx
@@ -24,12 +24,10 @@
 
 namespace drawinglayer
 {
-BitmapEx convertToBitmapEx(
-const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
-const geometry::ViewInformation2D& rViewInformation2D,
-sal_uInt32 nDiscreteWidth,
-sal_uInt32 nDiscreteHeight,
-sal_uInt32 nMaxSquarePixels);
+BitmapEx DRAWINGLAYER_DLLPUBLIC
+convertToBitmapEx(const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
+  const geometry::ViewInformation2D& rViewInformation2D, 
sal_uInt32 nDiscreteWidth,
+  sal_uInt32 nDiscreteHeight, sal_uInt32 nMaxSquarePixels);
 
 } // end of namespace drawinglayer
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer

[Noel Grandin (via logerrit)]

 drawinglayer/inc/primitive2d/cropprimitive2d.hxx   |8 --
 drawinglayer/inc/primitive2d/texteffectprimitive2d.hxx |8 --
 drawinglayer/inc/primitive2d/textlineprimitive2d.hxx   |8 --
 drawinglayer/inc/primitive2d/textstrikeoutprimitive2d.hxx  |   24 ++
 drawinglayer/inc/primitive2d/wallpaperprimitive2d.hxx  |8 --
 drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx   |8 --
 drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx |8 --
 drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx|8 --
 drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx   |7 -
 drawinglayer/inc/primitive3d/shadowprimitive3d.hxx |8 --
 drawinglayer/inc/primitive3d/textureprimitive3d.hxx|   40 
+++---
 drawinglayer/inc/processor3d/defaultprocessor3d.hxx|8 --
 drawinglayer/inc/processor3d/geometry2dextractor.hxx   |8 --
 drawinglayer/inc/processor3d/shadow3dextractor.hxx |8 --
 drawinglayer/inc/processor3d/zbufferprocessor3d.hxx|   11 +-
 drawinglayer/inc/texture/texture3d.hxx |   32 +++-
 drawinglayer/source/attribute/sdrglowattribute.cxx |7 -
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |5 -
 include/drawinglayer/animation/animationtiming.hxx |7 -
 include/drawinglayer/attribute/fillgradientattribute.hxx   |   16 +---
 include/drawinglayer/attribute/fillgraphicattribute.hxx|8 --
 include/drawinglayer/attribute/fillhatchattribute.hxx  |   16 +---
 include/drawinglayer/attribute/linestartendattribute.hxx   |8 --
 include/drawinglayer/attribute/materialattribute3d.hxx |8 --
 include/drawinglayer/attribute/sdrallattribute3d.hxx   |8 --
 include/drawinglayer/attribute/sdrfillattribute.hxx|8 --
 include/drawinglayer/attribute/sdrfillgraphicattribute.hxx |8 --
 include/drawinglayer/attribute/sdrglowattribute.hxx|8 --
 include/drawinglayer/attribute/sdrlightattribute3d.hxx |8 --
 include/drawinglayer/attribute/sdrlightingattribute3d.hxx  |8 --
 include/drawinglayer/attribute/sdrlineattribute.hxx|8 --
 include/drawinglayer/attribute/sdrlinestartendattribute.hxx|8 --
 include/drawinglayer/attribute/sdrobjectattribute3d.hxx|8 --
 include/drawinglayer/attribute/sdrsceneattribute3d.hxx |8 --
 include/drawinglayer/attribute/sdrshadowattribute.hxx  |8 --
 include/drawinglayer/geometry/viewinformation3d.hxx|8 --
 include/drawinglayer/primitive3d/baseprimitive3d.hxx   |   23 ++---
 include/drawinglayer/primitive3d/groupprimitive3d.hxx  |8 --
 include/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx  |8 --
 include/drawinglayer/primitive3d/polygonprimitive3d.hxx|   16 +---
 include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx|8 --
 include/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx|8 --
 include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx|7 -
 include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx |8 --
 include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx   |8 --
 include/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx |8 --
 include/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx  |8 --
 include/drawinglayer/primitive3d/transformprimitive3d.hxx  |8 --
 include/drawinglayer/processor2d/baseprocessor2d.hxx   |8 --
 include/drawinglayer/processor2d/contourextractor2d.hxx|8 --
 include/drawinglayer/processor2d/hittestprocessor2d.hxx|8 --
 include/drawinglayer/processor2d/linegeometryextractor2d.hxx   |8 --
 include/drawinglayer/processor2d/objectinfoextractor2d.hxx |8 --
 include/drawinglayer/processor2d/processor2dtools.hxx  |8 --
 include/drawinglayer/processor2d/processorfromoutputdevice.hxx |7 -
 include/drawinglayer/processor2d/textaspolygonextractor2d.hxx  |8 --
 include/drawinglayer/processor3d/baseprocessor3d.hxx   |8 --
 include/drawinglayer/processor3d/cutfindprocessor3d.hxx|8 --
 58 files changed, 209 insertions(+), 361 deletions(-)

New commits:
commit 1ebe85bc1fc6cf2adeb05aac78749806e20a71c2
Author: Noel Grandin 
AuthorDate: Thu Jul 16 18:11:15 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Jul 16 20:36:17 2020 +0200

compact namespace: drawinglayer

Change-Id: I32648ae81c4a06f944b70c0cca1694333ec02859
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98916
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx 
b/drawinglayer/inc/primitive2d/cropprimitive2d.hxx
index ba427eb6fba6..818e6f2b3771 100644
--- a/drawinglayer/inc/primitive2d/cropprimitive2d.hxx
+++ 

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

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx |2 +-
 drawinglayer/source/primitive2d/epsprimitive2d.cxx  |2 +-
 drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx|2 +-
 drawinglayer/source/primitive2d/gridprimitive2d.cxx |2 +-
 drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx   |2 +-
 drawinglayer/source/processor2d/hittestprocessor2d.cxx  |2 +-
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx  |4 ++--
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |6 +++---
 drawinglayer/source/processor2d/vclprocessor2d.cxx  |4 ++--
 drawinglayer/source/tools/wmfemfhelper.cxx  |6 +++---
 solenv/clang-format/blacklist   |6 +++---
 11 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit ad3cb89f02f84ba4bbd4fc288e31ef1595db7238
Author: Tomaž Vajngerl 
AuthorDate: Tue May 5 22:21:42 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sat May 9 21:03:58 2020 +0200

dl: move {Eps,FillHatch,PointArray}Primitive2D to global include

Change-Id: I85c10cb957f5065d964863360ca03355c87b7980
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93821
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx 
b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
index 17140a549436..ad85c02f22c1 100644
--- a/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
+++ b/drawinglayer/source/primitive2d/PolyPolygonHatchPrimitive2D.cxx
@@ -21,7 +21,7 @@
 
 #include 
 #include 
-#include 
+#include 
 
 using namespace com::sun::star;
 
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx 
b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index 8ad1db87ac4d..b519547c00d7 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 #include 
 
diff --git a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx 
b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
index 5919847ab33c..9c4ef03bfba3 100644
--- a/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drawinglayer/source/primitive2d/gridprimitive2d.cxx 
b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
index 66a747452103..e1d0841678e2 100644
--- a/drawinglayer/source/primitive2d/gridprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/gridprimitive2d.cxx
@@ -18,7 +18,7 @@
  */
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx 
b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
index 66ca43bd8004..7e527487eb85 100644
--- a/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
+#include 
 #include 
 
 
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx 
b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index 225fe4d5fb97..65a03548cb1c 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index b3c0d773fbff..73438efc40f9 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -47,7 +47,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -61,7 +61,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 // for PDFExtOutDevData Graphic support
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index cb0e3124b19d..4f7d6a22f723 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -59,9 +59,9 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 96b0bf9a97b5..5af4dcac755f 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer sc/source sfx2/inc sfx2/source svgio/source svx/inc svx/source sw/inc sw/source

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/inc/pch/precompiled_drawinglayer.hxx|   11 
 drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/borderlineprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/mediaprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx   |3 
 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx   |   10 
 drawinglayer/source/primitive2d/sdrdecompositiontools2d.cxx  |3 
 drawinglayer/source/primitive2d/svggradientprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/textprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/unifiedtransparenceprimitive2d.cxx   |2 
 drawinglayer/source/processor2d/contourextractor2d.cxx   |2 
 drawinglayer/source/processor2d/hittestprocessor2d.cxx   |2 
 drawinglayer/source/processor2d/linegeometryextractor2d.cxx  |2 
 drawinglayer/source/processor2d/textaspolygonextractor2d.cxx |3 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |8 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx  |9 
 drawinglayer/source/processor2d/vclprocessor2d.cxx   |9 
 drawinglayer/source/processor3d/geometry2dextractor.cxx  |2 
 drawinglayer/source/processor3d/shadow3dextractor.cxx|2 
 drawinglayer/source/tools/emfphelperdata.cxx |8 
 drawinglayer/source/tools/primitive2dxmldump.cxx |8 
 drawinglayer/source/tools/wmfemfhelper.cxx   |9 
 include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx |   67 +
 include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx  |   76 +
 include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx   |   73 +
 include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx  |   79 +
 include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx |   83 ++
 include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx|   88 ++
 include/drawinglayer/primitive2d/PolyPolygonSelectionPrimitive2D.hxx |   85 ++
 include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx|   87 ++
 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx  |  415 
--
 sc/source/ui/view/hintwin.cxx|2 
 sc/source/ui/view/overlayobject.cxx  |2 
 sfx2/inc/pch/precompiled_sfx.hxx |   12 
 sfx2/source/control/emojiviewitem.cxx|2 
 sfx2/source/control/templateviewitem.cxx |3 
 sfx2/source/control/thumbnailview.cxx|2 
 sfx2/source/control/thumbnailviewitem.cxx|2 
 sfx2/source/dialog/infobar.cxx   |3 
 svgio/source/svgreader/svgstyleattributes.cxx|3 
 svx/inc/pch/precompiled_svxcore.hxx  |   79 -
 svx/source/sdr/contact/viewcontactofsdrpage.cxx  |3 
 svx/source/sdr/contact/viewobjectcontactofpageobj.cxx|2 
 svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx |2 
 svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx|2 
 svx/source/sdr/overlay/overlayobjectcell.cxx |2 
 svx/source/sdr/overlay/overlaypolypolygon.cxx|3 
 svx/source/sdr/overlay/overlayrollingrectangle.cxx   |4 
 svx/source/sdr/overlay/overlayselection.cxx  |3 
 svx/source/sdr/overlay/overlaytools.cxx  |4 
 svx/source/sdr/overlay/overlaytriangle.cxx   |2 
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |5 
 svx/source/svdraw/svddrgmt.cxx   |3 
 svx/source/table/tablehandles.cxx|2 
 svx/source/xoutdev/xtabgrdt.cxx  |2 
 svx/source/xoutdev/xtabhtch.cxx  |2 
 sw/inc/pch/precompiled_sw.hxx|3 
 sw/source/core/crsr/overlayrangesoutline.cxx |2 
 sw/source/core/layout/paintfrm.cxx   |2 
 sw/source/uibase/docvw/AnchorOverlayObject.cxx   |2 
 sw/source/uibase/docvw/DashedLine.cxx|2 
 sw/source/uibase/docvw/HeaderFooterWin.cxx  

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

[Noel Grandin (via logerrit)]

 drawinglayer/inc/pch/precompiled_drawinglayer.hxx |   12 --
 drawinglayer/inc/primitive3d/hatchtextureprimitive3d.hxx  |7 -
 drawinglayer/inc/primitive3d/hiddengeometryprimitive3d.hxx|5 -
 drawinglayer/inc/primitive3d/polygontubeprimitive3d.hxx   |5 -
 drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx  |   23 ++---
 drawinglayer/inc/primitive3d/shadowprimitive3d.hxx|5 -
 drawinglayer/inc/primitive3d/textureprimitive3d.hxx   |5 -
 drawinglayer/inc/processor3d/defaultprocessor3d.hxx   |5 -
 drawinglayer/inc/processor3d/geometry2dextractor.hxx  |4 
 drawinglayer/inc/processor3d/shadow3dextractor.hxx|5 -
 drawinglayer/inc/processor3d/zbufferprocessor3d.hxx   |7 -
 drawinglayer/inc/texture/texture.hxx  |5 -
 drawinglayer/inc/texture/texture3d.hxx|7 -
 drawinglayer/source/primitive2d/cropprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/epsprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/fillgraphicprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/fillhatchprimitive2d.cxx  |4 
 drawinglayer/source/primitive2d/graphicprimitive2d.cxx|4 
 drawinglayer/source/primitive2d/graphicprimitivehelper2d.cxx  |2 
 drawinglayer/source/primitive2d/gridprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/pointarrayprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/polypolygonprimitive2d.cxx|2 
 drawinglayer/source/primitive2d/sceneprimitive2d.cxx  |6 -
 drawinglayer/source/primitive2d/textdecoratedprimitive2d.cxx  |6 -
 drawinglayer/source/primitive2d/texteffectprimitive2d.cxx |2 
 drawinglayer/source/primitive2d/textlineprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/textprimitive2d.cxx   |2 
 drawinglayer/source/primitive2d/textstrikeoutprimitive2d.cxx  |2 
 drawinglayer/source/primitive2d/wallpaperprimitive2d.cxx  |2 
 drawinglayer/source/primitive3d/hatchtextureprimitive3d.cxx   |4 
 drawinglayer/source/primitive3d/hiddengeometryprimitive3d.cxx |2 
 drawinglayer/source/primitive3d/polygonprimitive3d.cxx|2 
 drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx|2 
 drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx|2 
 drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx   |   10 +-
 drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx |2 
 drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx   |2 
 drawinglayer/source/primitive3d/sdrpolypolygonprimitive3d.cxx |2 
 drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx  |2 
 drawinglayer/source/primitive3d/shadowprimitive3d.cxx |2 
 drawinglayer/source/primitive3d/textureprimitive3d.cxx|2 
 drawinglayer/source/processor2d/hittestprocessor2d.cxx|2 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx|4 
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx   |6 -
 drawinglayer/source/processor2d/vclprocessor2d.cxx|4 
 drawinglayer/source/processor3d/cutfindprocessor3d.cxx|4 
 drawinglayer/source/processor3d/defaultprocessor3d.cxx|   10 +-
 drawinglayer/source/processor3d/geometry2dextractor.cxx   |4 
 drawinglayer/source/processor3d/shadow3dextractor.cxx |4 
 drawinglayer/source/processor3d/zbufferprocessor3d.cxx|4 
 drawinglayer/source/texture/texture.cxx   |2 
 drawinglayer/source/texture/texture3d.cxx |4 
 drawinglayer/source/tools/wmfemfhelper.cxx|   12 +-
 solenv/clang-format/blacklist |   44 +-
 57 files changed, 121 insertions(+), 164 deletions(-)

New commits:
commit ad38105f45b517e09bf65a76e66517ece41fb62e
Author: Noel Grandin 
AuthorDate: Fri Mar 20 12:09:42 2020 +0200
Commit: Noel Grandin 
CommitDate: Sat Mar 21 10:30:07 2020 +0100

move headers inside modules

Change-Id: Iad5c414861eb807e6246b8a988b94d66ef5f687d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90776
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx 
b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index c07ffd345150..b5fb42d97e6e 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- 

[Libreoffice-commits] core.git: drawinglayer/inc drawinglayer/source include/drawinglayer

[Tor Lillqvist]

 drawinglayer/inc/converters.hxx  |   30 -
 drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx |5 
 drawinglayer/source/primitive2d/patternfillprimitive2d.cxx   |5 
 drawinglayer/source/primitive2d/polygonprimitive2d.cxx   |9 
 drawinglayer/source/texture/texture.cxx  |9 
 drawinglayer/source/tools/converters.cxx |  194 +--
 6 files changed, 123 insertions(+), 129 deletions(-)

New commits:
commit 632edfabe8065cd59a237d975ee03468ce4d868b
Author: Tor Lillqvist 
Date:   Fri Sep 22 10:21:50 2017 +0300

 can be internal to drawinglayer

And while moving it, get rid of the 'drawinglyer::tools' subnamespace.
Less potential confusion with the global 'tools' namespace.

Change-Id: Iab3c25be0cec7f3d182228d122837e9f2ac9a529
Reviewed-on: https://gerrit.libreoffice.org/42619
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/include/drawinglayer/tools/converters.hxx 
b/drawinglayer/inc/converters.hxx
similarity index 65%
rename from include/drawinglayer/tools/converters.hxx
rename to drawinglayer/inc/converters.hxx
index c5f6bcd38c49..6f520509bb2f 100644
--- a/include/drawinglayer/tools/converters.hxx
+++ b/drawinglayer/inc/converters.hxx
@@ -17,31 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_TOOLS_CONVERTERS_HXX
-#define INCLUDED_DRAWINGLAYER_TOOLS_CONVERTERS_HXX
+#ifndef INCLUDED_DRAWINGLAYER_INC_CONVERTERS_HXX
+#define INCLUDED_DRAWINGLAYER_INC_CONVERTERS_HXX
 
 #include 
 #include 
 #include 
 
-
 namespace drawinglayer
 {
-namespace tools
-{
-BitmapEx DRAWINGLAYER_DLLPUBLIC convertToBitmapEx(
-const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
-const geometry::ViewInformation2D& rViewInformation2D,
-sal_uInt32 nDiscreteWidth,
-sal_uInt32 nDiscreteHeight,
-sal_uInt32 nMaxQuadratPixels);
-
-double DRAWINGLAYER_DLLPUBLIC getRandomColorRange();
-
-} // end of namespace tools
-} // end of namespace drawinglayer
 
+BitmapEx convertToBitmapEx(
+const drawinglayer::primitive2d::Primitive2DContainer& rSeq,
+const geometry::ViewInformation2D& rViewInformation2D,
+sal_uInt32 nDiscreteWidth,
+sal_uInt32 nDiscreteHeight,
+sal_uInt32 nMaxQuadratPixels);
+
+double getRandomColorRange();
+
+} // end of namespace drawinglayer
 
-#endif // INCLUDED_DRAWINGLAYER_TOOLS_CONVERTERS_HXX
+#endif // INCLUDED_DRAWINGLAYER_INC_CONVERTERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx 
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 8a515b117e4d..02dd689b7048 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -31,12 +31,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
+#include "converters.hxx"
+
 #include 
 
 using namespace ::com::sun::star;
@@ -160,7 +161,7 @@ namespace drawinglayer
 const primitive2d::Primitive2DContainer xEmbedSeq { 
xEmbedRef };
 
 BitmapEx aBitmapEx(
-tools::convertToBitmapEx(
+convertToBitmapEx(
 xEmbedSeq,
 aViewInformation2D,
 nDiscreteWidth,
diff --git a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx 
b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
index 6d6ef225d022..ed26d32470b9 100644
--- a/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
@@ -26,9 +26,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
+#include "converters.hxx"
+
 using namespace com::sun::star;
 
 #define MAXIMUM_SQUARE_LENGTH (186.0)
@@ -109,7 +110,7 @@ namespace drawinglayer
 const primitive2d::Primitive2DContainer xEmbedSeq { xEmbedRef 
};
 
 const BitmapEx aBitmapEx(
-tools::convertToBitmapEx(
+convertToBitmapEx(
 xEmbedSeq,
 aViewInformation2D,
 mnDiscreteWidth,
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx 
b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 2f6deba32bfe..0511d3602fd4 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -206,12 +206,9 @@ namespace drawinglayer
 
 namespace drawinglayer
 {
-namespace tools
+double getRandomColorRange()
 {
-double getRandomColorRange()
-{
-return