drawinglayer/source/processor2d/vclprocessor2d.hxx | 190 +++++++++++----------
solenv/clang-format/blacklist | 1
2 files changed, 101 insertions(+), 90 deletions(-)
New commits:
commit 53d7d35b6b065ced89a7533afbea710e8c5b99bc
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Sun Apr 12 13:09:36 2020 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Apr 14 23:23:17 2020 +0200
remove vclprocessor2d.hxx from clang-format blacklist
Change-Id: I4fda4b3431c63d5870f074be15cff6064dc1ff95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92221
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.hxx
b/drawinglayer/source/processor2d/vclprocessor2d.hxx
index 73cf8d5b1a8d..3b1b997a7cc4 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.hxx
@@ -27,99 +27,111 @@
class OutputDevice;
-namespace drawinglayer::primitive2d {
- class TextSimplePortionPrimitive2D;
- class PolygonHairlinePrimitive2D;
- class BitmapPrimitive2D;
- class FillGraphicPrimitive2D;
- class PolyPolygonGradientPrimitive2D;
- class PolyPolygonGraphicPrimitive2D;
- class MetafilePrimitive2D;
- class MaskPrimitive2D;
- class UnifiedTransparencePrimitive2D;
- class TransparencePrimitive2D;
- class TransformPrimitive2D;
- class MarkerArrayPrimitive2D;
- class PointArrayPrimitive2D;
- class ModifiedColorPrimitive2D;
- class PolygonStrokePrimitive2D;
- class ControlPrimitive2D;
- class PagePreviewPrimitive2D;
- class EpsPrimitive2D;
- class ObjectInfoPrimitive2D;
- class SvgLinearAtomPrimitive2D;
- class SvgRadialAtomPrimitive2D;
+namespace drawinglayer::primitive2d
+{
+class TextSimplePortionPrimitive2D;
+class PolygonHairlinePrimitive2D;
+class BitmapPrimitive2D;
+class FillGraphicPrimitive2D;
+class PolyPolygonGradientPrimitive2D;
+class PolyPolygonGraphicPrimitive2D;
+class MetafilePrimitive2D;
+class MaskPrimitive2D;
+class UnifiedTransparencePrimitive2D;
+class TransparencePrimitive2D;
+class TransformPrimitive2D;
+class MarkerArrayPrimitive2D;
+class PointArrayPrimitive2D;
+class ModifiedColorPrimitive2D;
+class PolygonStrokePrimitive2D;
+class ControlPrimitive2D;
+class PagePreviewPrimitive2D;
+class EpsPrimitive2D;
+class ObjectInfoPrimitive2D;
+class SvgLinearAtomPrimitive2D;
+class SvgRadialAtomPrimitive2D;
}
namespace drawinglayer::processor2d
{
- /** VclProcessor2D class
-
- This processor is the base class for VCL-Based processors. It has
no
- processBasePrimitive2D implementation and thus is not usable
directly.
- */
- class VclProcessor2D : public BaseProcessor2D
- {
- protected:
- // the destination OutDev
- VclPtr<OutputDevice>
mpOutputDevice;
-
- // the modifiedColorPrimitive stack
- basegfx::BColorModifierStack
maBColorModifierStack;
-
- // the current transformation. Since VCL pixel renderer transforms
to pixels
- // and VCL MetaFile renderer to World (logic) coordinates, the
local
- // ViewInformation2D cannot directly be used, but needs to be kept
up to date
- basegfx::B2DHomMatrix
maCurrentTransformation;
-
- // SvtOptionsDrawinglayer incarnation to react on diverse settings
- const SvtOptionsDrawinglayer
maDrawinglayerOpt;
-
- // stack value (increment and decrement) to count how deep we are
in
- // PolygonStrokePrimitive2D's decompositions (normally only one)
- sal_uInt32
mnPolygonStrokePrimitive2D;
-
- // currently used ObjectInfoPrimitive2D
- const primitive2d::ObjectInfoPrimitive2D*
mpObjectInfoPrimitive2D;
-
- // common VCL rendering support
- void RenderTextSimpleOrDecoratedPortionPrimitive2D(const
primitive2d::TextSimplePortionPrimitive2D& rTextCandidate);
- void RenderPolygonHairlinePrimitive2D(const
primitive2d::PolygonHairlinePrimitive2D& rPolygonCandidate, bool bPixelBased);
- void RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D&
rBitmapCandidate);
- void RenderFillGraphicPrimitive2D(const
primitive2d::FillGraphicPrimitive2D& rFillBitmapCandidate);
- void RenderPolyPolygonGraphicPrimitive2D(const
primitive2d::PolyPolygonGraphicPrimitive2D& rPolygonCandidate);
- void RenderMaskPrimitive2DPixel(const
primitive2d::MaskPrimitive2D& rMaskCandidate);
- void RenderModifiedColorPrimitive2D(const
primitive2d::ModifiedColorPrimitive2D& rModifiedCandidate);
- void RenderUnifiedTransparencePrimitive2D(const
primitive2d::UnifiedTransparencePrimitive2D& rTransCandidate);
- void RenderTransparencePrimitive2D(const
primitive2d::TransparencePrimitive2D& rTransCandidate);
- void RenderTransformPrimitive2D(const
primitive2d::TransformPrimitive2D& rTransformCandidate);
- void RenderPagePreviewPrimitive2D(const
primitive2d::PagePreviewPrimitive2D& rPagePreviewCandidate);
- void RenderMarkerArrayPrimitive2D(const
primitive2d::MarkerArrayPrimitive2D& rMarkerArrayCandidate);
- void RenderPointArrayPrimitive2D(const
primitive2d::PointArrayPrimitive2D& rPointArrayCandidate);
- void RenderPolygonStrokePrimitive2D(const
primitive2d::PolygonStrokePrimitive2D& rPolygonStrokeCandidate);
- void RenderEpsPrimitive2D(const primitive2d::EpsPrimitive2D&
rEpsPrimitive2D);
- void RenderObjectInfoPrimitive2D(const
primitive2d::ObjectInfoPrimitive2D& rObjectInfoPrimitive2D);
- void RenderSvgLinearAtomPrimitive2D(const
primitive2d::SvgLinearAtomPrimitive2D& rCandidate);
- void RenderSvgRadialAtomPrimitive2D(const
primitive2d::SvgRadialAtomPrimitive2D& rCandidate);
-
- // DrawMode adaptation support
- void adaptLineToFillDrawMode() const;
- void adaptTextToFillDrawMode() const;
-
- public:
- // constructor/destructor
- VclProcessor2D(
- const geometry::ViewInformation2D& rViewInformation,
- OutputDevice& rOutDev);
- virtual ~VclProcessor2D() override;
-
- // access to Drawinglayer configuration options
- const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const {
return maDrawinglayerOpt; }
-
- // access to currently used ObjectInfoPrimitive2D
- const primitive2d::ObjectInfoPrimitive2D*
getObjectInfoPrimitive2D() const { return mpObjectInfoPrimitive2D; }
- };
-} // end of namespace drawinglayer::processor2d
+/** VclProcessor2D class
+ This processor is the base class for VCL-Based processors. It has no
+ processBasePrimitive2D implementation and thus is not usable directly.
+ */
+class VclProcessor2D : public BaseProcessor2D
+{
+protected:
+ // the destination OutDev
+ VclPtr<OutputDevice> mpOutputDevice;
+
+ // the modifiedColorPrimitive stack
+ basegfx::BColorModifierStack maBColorModifierStack;
+
+ // the current transformation. Since VCL pixel renderer transforms to
pixels
+ // and VCL MetaFile renderer to World (logic) coordinates, the local
+ // ViewInformation2D cannot directly be used, but needs to be kept up to
date
+ basegfx::B2DHomMatrix maCurrentTransformation;
+
+ // SvtOptionsDrawinglayer incarnation to react on diverse settings
+ const SvtOptionsDrawinglayer maDrawinglayerOpt;
+
+ // stack value (increment and decrement) to count how deep we are in
+ // PolygonStrokePrimitive2D's decompositions (normally only one)
+ sal_uInt32 mnPolygonStrokePrimitive2D;
+
+ // currently used ObjectInfoPrimitive2D
+ const primitive2d::ObjectInfoPrimitive2D* mpObjectInfoPrimitive2D;
+
+ // common VCL rendering support
+ void RenderTextSimpleOrDecoratedPortionPrimitive2D(
+ const primitive2d::TextSimplePortionPrimitive2D& rTextCandidate);
+ void RenderPolygonHairlinePrimitive2D(
+ const primitive2d::PolygonHairlinePrimitive2D& rPolygonCandidate, bool
bPixelBased);
+ void RenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D&
rBitmapCandidate);
+ void
+ RenderFillGraphicPrimitive2D(const primitive2d::FillGraphicPrimitive2D&
rFillBitmapCandidate);
+ void RenderPolyPolygonGraphicPrimitive2D(
+ const primitive2d::PolyPolygonGraphicPrimitive2D& rPolygonCandidate);
+ void RenderMaskPrimitive2DPixel(const primitive2d::MaskPrimitive2D&
rMaskCandidate);
+ void
+ RenderModifiedColorPrimitive2D(const
primitive2d::ModifiedColorPrimitive2D& rModifiedCandidate);
+ void RenderUnifiedTransparencePrimitive2D(
+ const primitive2d::UnifiedTransparencePrimitive2D& rTransCandidate);
+ void RenderTransparencePrimitive2D(const
primitive2d::TransparencePrimitive2D& rTransCandidate);
+ void RenderTransformPrimitive2D(const primitive2d::TransformPrimitive2D&
rTransformCandidate);
+ void
+ RenderPagePreviewPrimitive2D(const primitive2d::PagePreviewPrimitive2D&
rPagePreviewCandidate);
+ void
+ RenderMarkerArrayPrimitive2D(const primitive2d::MarkerArrayPrimitive2D&
rMarkerArrayCandidate);
+ void
+ RenderPointArrayPrimitive2D(const primitive2d::PointArrayPrimitive2D&
rPointArrayCandidate);
+ void RenderPolygonStrokePrimitive2D(
+ const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokeCandidate);
+ void RenderEpsPrimitive2D(const primitive2d::EpsPrimitive2D&
rEpsPrimitive2D);
+ void
+ RenderObjectInfoPrimitive2D(const primitive2d::ObjectInfoPrimitive2D&
rObjectInfoPrimitive2D);
+ void RenderSvgLinearAtomPrimitive2D(const
primitive2d::SvgLinearAtomPrimitive2D& rCandidate);
+ void RenderSvgRadialAtomPrimitive2D(const
primitive2d::SvgRadialAtomPrimitive2D& rCandidate);
+
+ // DrawMode adaptation support
+ void adaptLineToFillDrawMode() const;
+ void adaptTextToFillDrawMode() const;
+
+public:
+ // constructor/destructor
+ VclProcessor2D(const geometry::ViewInformation2D& rViewInformation,
OutputDevice& rOutDev);
+ virtual ~VclProcessor2D() override;
+
+ // access to Drawinglayer configuration options
+ const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return
maDrawinglayerOpt; }
+
+ // access to currently used ObjectInfoPrimitive2D
+ const primitive2d::ObjectInfoPrimitive2D* getObjectInfoPrimitive2D() const
+ {
+ return mpObjectInfoPrimitive2D;
+ }
+};
+} // end of namespace drawinglayer::processor2d
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 58eb54478155..7da40d322789 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -3759,7 +3759,6 @@ drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
drawinglayer/source/processor2d/vclpixelprocessor2d.hxx
drawinglayer/source/processor2d/vclprocessor2d.cxx
-drawinglayer/source/processor2d/vclprocessor2d.hxx
drawinglayer/source/processor3d/baseprocessor3d.cxx
drawinglayer/source/processor3d/cutfindprocessor3d.cxx
drawinglayer/source/processor3d/defaultprocessor3d.cxx
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
