summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2017-08-18 23:31:10 +0200
committerJochen Nitschke <j.nitschke+logerrit@ok.de>2017-08-19 11:54:25 +0200
commitdaecb11ee244b1306cec14a2e1fc5237926786d8 (patch)
tree5240b955c25d3ce34b2b4e6f8ebf63f98c2e97c4
parentbf41e713f62d4a181a6916680cd64d60728b1a52 (diff)
Removed ignored includes
By brute force analysis, it seems to me that we can easily remove these not used includes. It passed "make check install" Change-Id: I34ea2aae57e56fb8b2cf1066cf51b08068fa0b53 Reviewed-on: https://gerrit.libreoffice.org/41312 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
-rw-r--r--bridges/inc/arraypointer.hxx49
-rw-r--r--include/basegfx/polygon/b2dpolypolygonfillrule.hxx45
-rw-r--r--include/canvas/rendering/bitmap.hxx302
-rw-r--r--include/canvas/rendering/icachedprimitive.hxx58
-rw-r--r--include/drawinglayer/attribute/fillbitmapattribute.hxx82
-rw-r--r--include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx87
-rw-r--r--include/drawinglayer/processor2d/canvasprocessor.hxx115
7 files changed, 0 insertions, 738 deletions
diff --git a/bridges/inc/arraypointer.hxx b/bridges/inc/arraypointer.hxx
deleted file mode 100644
index 84e5297f3eb4..000000000000
--- a/bridges/inc/arraypointer.hxx
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BRIDGES_INC_ARRAYPOINTER_HXX
-#define INCLUDED_BRIDGES_INC_ARRAYPOINTER_HXX
-
-#include "sal/config.h"
-
-namespace bridges { namespace cpp_uno { namespace shared {
-
-/**
- * A simple smart pointer that holds an array until it is being released.
- */
-template< typename T > class ArrayPointer {
-public:
- ArrayPointer(T * p): p_(p) {}
-
- ~ArrayPointer() { delete[] p_; }
-
- T * release() { T * t = p_; p_ = 0; return t; }
-
-private:
- ArrayPointer(ArrayPointer &); // not defined
- void operator =(ArrayPointer &); // not defined
-
- T * p_;
-};
-
-} } }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx b/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
deleted file mode 100644
index 2131c7d2f2d1..000000000000
--- a/include/basegfx/polygon/b2dpolypolygonfillrule.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
-#define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
-
-#include <sal/types.h>
-
-
-namespace basegfx
-{
- /** Fill rule to use for poly-polygon filling.
-
- The fill rule determines which areas are inside, and which are
- outside the poly-polygon.
- */
- enum class FillRule
- {
- /** Areas, for which a scanline has crossed an odd number of
- vertices, are regarded 'inside', the remainder 'outside'
- of the poly-polygon.
- */
- EvenOdd
- };
-}
-
-#endif // INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONFILLRULE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/bitmap.hxx b/include/canvas/rendering/bitmap.hxx
deleted file mode 100644
index 3a878ce64da9..000000000000
--- a/include/canvas/rendering/bitmap.hxx
+++ /dev/null
@@ -1,302 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CANVAS_RENDERING_BITMAP_HXX
-#define INCLUDED_CANVAS_RENDERING_BITMAP_HXX
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
-#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
-#include <com/sun/star/geometry/IntegerPoint2D.hpp>
-#include <canvas/rendering/icolorbuffer.hxx>
-#include <canvas/rendering/icachedprimitive.hxx>
-#include <canvas/rendering/isurfaceproxymanager.hxx>
-
-#include <memory>
-#include <vector>
-
-namespace basegfx
-{
- class B2IVector;
- class B2DPoint;
- class B2DHomMatrix;
- class B2DPolyPolygon;
-}
-
-namespace canvas
-{
- class ImplBitmap;
-
- /** Bitmap class, with XCanvas-like render interface.
-
- This class provides a bitmap, that can be rendered into,
- with an interface compatible to XCanvas. Furthermore, the
- bitmaps held here can optionally be backed by (possibly
- hw-accelerated) textures.
- */
- class Bitmap
- {
- public:
- /** Create bitmap with given size
-
- @param rSize
- Size of the bitmap, in pixel
-
- @param rMgr
- SurfaceProxyManager, to use for HW acceleration
-
- @param bWithAlpha
- When true, the created bitmap will have an alpha channel,
- false otherwise
- */
- Bitmap( const ::basegfx::B2IVector& rSize,
- const std::shared_ptr<ISurfaceProxyManager>& rMgr,
- bool bWithAlpha );
- ~Bitmap();
-
- /// Query whether this bitmap contains alpha channel information
- bool hasAlpha() const;
-
- /// Query size of the bitmap in pixel
- ::basegfx::B2IVector getSize() const;
-
- css::uno::Sequence< sal_Int8 > getData(
- css::rendering::IntegerBitmapLayout& bitmapLayout,
- const css::geometry::IntegerRectangle2D& rect );
-
- void setData(
- const css::uno::Sequence< sal_Int8 >& data,
- const css::rendering::IntegerBitmapLayout& bitmapLayout,
- const css::geometry::IntegerRectangle2D& rect );
-
- void setPixel(
- const css::uno::Sequence< sal_Int8 >& color,
- const css::rendering::IntegerBitmapLayout& bitmapLayout,
- const css::geometry::IntegerPoint2D& pos );
-
- css::uno::Sequence< sal_Int8 > getPixel(
- css::rendering::IntegerBitmapLayout& bitmapLayout,
- const css::geometry::IntegerPoint2D& pos );
-
- /** Render the bitmap content to associated
- SurfaceProxyManager's screen.
-
- @param fAlpha
- Overall alpha for content
-
- @param rPos
- Output position
-
- @param rTransform
- Output transformation (does not affect output position)
- */
- bool draw( double fAlpha,
- const ::basegfx::B2DPoint& rPos,
- const ::basegfx::B2DHomMatrix& rTransform );
-
- /** Render the bitmap content to associated
- SurfaceProxyManager's screen.
-
- @param fAlpha
- Overall alpha for content
-
- @param rPos
- Output position
-
- @param rArea
- Subset of the surface to render. Coordinate system are
- surface area pixel, given area will be clipped to the
- surface bounds.
-
- @param rTransform
- Output transformation (does not affect output position)
- */
- bool draw( double fAlpha,
- const ::basegfx::B2DPoint& rPos,
- const ::basegfx::B2DRange& rArea,
- const ::basegfx::B2DHomMatrix& rTransform );
-
- /** Render the bitmap content to associated
- SurfaceProxyManager's screen.
-
- @param fAlpha
- Overall alpha for content
-
- @param rPos
- Output position
-
- @param rClipPoly
- Clip polygon for the surface. The clip polygon is also
- subject to the output transformation.
-
- @param rTransform
- Output transformation (does not affect output position)
- */
- bool draw( double fAlpha,
- const ::basegfx::B2DPoint& rPos,
- const ::basegfx::B2DPolyPolygon& rClipPoly,
- const ::basegfx::B2DHomMatrix& rTransform );
-
- /** Clear whole bitmap with given color.
-
- This method sets every single pixel of the bitmap to the
- specified color value.
- */
- void clear( const css::uno::Sequence< double >& color );
-
- void fillB2DPolyPolygon(
- const ::basegfx::B2DPolyPolygon& rPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
-
-
- // High-level drawing operations (from the XCanvas interface)
-
-
- /// See XCanvas interface
- void drawPoint( const css::geometry::RealPoint2D& aPoint,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
- /// See XCanvas interface
- void drawLine( const css::geometry::RealPoint2D& aStartPoint,
- const css::geometry::RealPoint2D& aEndPoint,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
- /// See XCanvas interface
- void drawBezier( const css::geometry::RealBezierSegment2D& aBezierSegment,
- const css::geometry::RealPoint2D& aEndPoint,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> drawPolyPolygon(
- const css::uno::Reference<
- css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
-
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> strokePolyPolygon(
- const css::uno::Reference<
- css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState,
- const css::rendering::StrokeAttributes& strokeAttributes );
- /** See XCanvas interface
-
- @param textureAnnotations
- Vector of shared pointers to bitmap textures,
- <em>corresponding</em> in indices to the textures
- sequence. This is to decouple this interface from the
- client's XBitmap-implementation class.
- */
- std::shared_ptr<ICachedPrimitive> strokeTexturedPolyPolygon(
- const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState,
- const css::uno::Sequence< css::rendering::Texture >& textures,
- const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations,
- const css::rendering::StrokeAttributes& strokeAttributes );
- /** See XCanvas interface
-
- @param textureAnnotations
- Vector of shared pointers to bitmap textures,
- <em>corresponding</em> in indices to the textures
- sequence. This is to decouple this interface from the
- client's XBitmap-implementation class.
- */
- std::shared_ptr<ICachedPrimitive> strokeTextureMappedPolyPolygon(
- const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState,
- const css::uno::Sequence< css::rendering::Texture >& textures,
- const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations,
- const css::uno::Reference< css::geometry::XMapping2D >& xMapping,
- const css::rendering::StrokeAttributes& strokeAttributes );
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> fillPolyPolygon(
- const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
- /** See XCanvas interface
-
- @param textureAnnotations
- Vector of shared pointers to bitmap textures,
- <em>corresponding</em> in indices to the textures
- sequence. This is to decouple this interface from the
- client's XBitmap-implementation class.
- */
- std::shared_ptr<ICachedPrimitive> fillTexturedPolyPolygon(
- const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState,
- const css::uno::Sequence< css::rendering::Texture >& textures,
- const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations );
- /** See XCanvas interface
-
- @param textureAnnotations
- Vector of shared pointers to bitmap textures,
- <em>corresponding</em> in indices to the textures
- sequence. This is to decouple this interface from the
- client's XBitmap-implementation class.
- */
- std::shared_ptr<ICachedPrimitive> fillTextureMappedPolyPolygon(
- const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState,
- const css::uno::Sequence< css::rendering::Texture >& textures,
- const ::std::vector< std::shared_ptr<Bitmap> >& textureAnnotations,
- const css::uno::Reference< css::geometry::XMapping2D >& xMapping );
-
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> drawBitmap(
- const css::uno::Reference<
- css::rendering::XBitmap >& xBitmap,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> drawBitmap(
- const std::shared_ptr<Bitmap>& rImage,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
-
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> drawBitmapModulated(
- const css::uno::Reference<
- css::rendering::XBitmap >& xBitmap,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
- /// See XCanvas interface
- std::shared_ptr<ICachedPrimitive> drawBitmapModulated(
- const std::shared_ptr<Bitmap>& rImage,
- const css::rendering::ViewState& viewState,
- const css::rendering::RenderState& renderState );
-
- private:
- friend class ImplBitmap;
-
- const std::unique_ptr< ImplBitmap > mxImpl;
- };
-
- typedef std::shared_ptr< Bitmap > BitmapSharedPtr;
-}
-
-#endif // INCLUDED_CANVAS_RENDERING_BITMAP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/canvas/rendering/icachedprimitive.hxx b/include/canvas/rendering/icachedprimitive.hxx
deleted file mode 100644
index 2fd279476d3d..000000000000
--- a/include/canvas/rendering/icachedprimitive.hxx
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
-#define INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
-
-#include <com/sun/star/rendering/Viewstate.hpp>
-#include <sal/types.h>
-
-#include <memory>
-
-namespace basegfx
-{
- class B2IRange;
- class B2IPoint;
-}
-
-namespace canvas
-{
- /** Objects with this interface are returned from every Bitmap
- render operation.
-
- These objects can be used to implement the
- rendering::XCachedPrimitive interface, which in turn caches
- render state and objects to facilitate quick redraws.
- */
- struct ICachedPrimitive
- {
- virtual ~ICachedPrimitive() {}
-
- /** Redraw the primitive with the given view state
-
- Note that the primitive will <em>always</em> be redrawn on
- the bitmap it was created from.
- */
- virtual sal_Int8 redraw( const css::rendering::ViewState& aState ) const = 0;
- };
-}
-
-#endif // INCLUDED_CANVAS_RENDERING_ICACHEDPRIMITIVE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/attribute/fillbitmapattribute.hxx b/include/drawinglayer/attribute/fillbitmapattribute.hxx
deleted file mode 100644
index fedcaaa309a5..000000000000
--- a/include/drawinglayer/attribute/fillbitmapattribute.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
-#define INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
-
-#include <drawinglayer/drawinglayerdllapi.h>
-#include <o3tl/cow_wrapper.hxx>
-
-
-// predefines
-
-class BitmapEx;
-
-namespace basegfx {
- class B2DPoint;
- class B2DVector;
-}
-
-namespace drawinglayer { namespace attribute {
- class ImpFillBitmapAttribute;
-}}
-
-
-namespace drawinglayer
-{
- namespace attribute
- {
- class DRAWINGLAYER_DLLPUBLIC FillBitmapAttribute
- {
- public:
- typedef o3tl::cow_wrapper< ImpFillBitmapAttribute > ImplType;
-
- private:
- ImplType mpFillBitmapAttribute;
-
- public:
- /// constructors/assignmentoperator/destructor
- FillBitmapAttribute(
- const BitmapEx& rBitmapEx,
- const basegfx::B2DPoint& rTopLeft,
- const basegfx::B2DVector& rSize,
- bool bTiling);
- FillBitmapAttribute(const FillBitmapAttribute& rCandidate);
- FillBitmapAttribute& operator=(const FillBitmapAttribute& rCandidate);
- ~FillBitmapAttribute();
-
- // checks if the incarnation is default constructed
- bool isDefault() const;
-
- // compare operator
- bool operator==(const FillBitmapAttribute& rCandidate) const;
-
- // data read access
- const BitmapEx& getBitmapEx() const;
- const basegfx::B2DPoint& getTopLeft() const;
- const basegfx::B2DVector& getSize() const;
- bool getTiling() const;
- };
- } // end of namespace attribute
-} // end of namespace drawinglayer
-
-
-#endif //INCLUDED_DRAWINGLAYER_ATTRIBUTE_FILLBITMAPATTRIBUTE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx b/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
deleted file mode 100644
index 377354a34500..000000000000
--- a/include/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX
-#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX
-
-#include <drawinglayer/drawinglayerdllapi.h>
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <drawinglayer/attribute/fillbitmapattribute.hxx>
-
-
-// FillbitmapPrimitive2D class
-
-namespace drawinglayer
-{
- namespace primitive2d
- {
- /** FillBitmapPrimitive2D class
-
- This class defines a bitmap filling for a rectangular area. The
- Range is defined by the Transformation, the fill by the FillBitmapAttribute.
- There, the fill consists of a Bitmap (not transparent) defining the fill data
- and a Point/Vector pair defining the relative position/size [0.0 .. 1.0]
- inside the area where the bitmap is positioned. A flag defines then if this
- is tiled or not.
-
- Renderers should handle this primitive; it has a geometrically correct
- decomposition, but on pixel oututs the areas where the tiled pieces are
- aligned tend to show up (one overlapping or empty pixel)
- */
- class DRAWINGLAYER_DLLPUBLIC FillBitmapPrimitive2D : public BufferedDecompositionPrimitive2D
- {
- private:
- /// the geometric definition
- basegfx::B2DHomMatrix maTransformation;
-
- /// the fill attributes
- attribute::FillBitmapAttribute maFillBitmap;
-
- protected:
- /// local decomposition.
- virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const;
-
- public:
- /// constructor
- FillBitmapPrimitive2D(
- const basegfx::B2DHomMatrix& rTransformation,
- const attribute::FillBitmapAttribute& rFillBitmap);
-
- /// data read access
- const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; }
- const attribute::FillBitmapAttribute& getFillBitmap() const { return maFillBitmap; }
-
- /// compare operator
- virtual bool operator==( const BasePrimitive2D& rPrimitive ) const;
-
- /// get range
- virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const;
-
- /// provide unique ID
- DeclPrimitive2DIDBlock()
- };
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-
-
-#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_FILLBITMAPPRIMITIVE2D_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/drawinglayer/processor2d/canvasprocessor.hxx b/include/drawinglayer/processor2d/canvasprocessor.hxx
deleted file mode 100644
index ab773c8073c7..000000000000
--- a/include/drawinglayer/processor2d/canvasprocessor.hxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX
-#define INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX
-
-#include <basegfx/color/bcolormodifier.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <com/sun/star/rendering/RenderState.hpp>
-#include <com/sun/star/rendering/ViewState.hpp>
-#include <drawinglayer/drawinglayerdllapi.h>
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <i18nlangtag/lang.h>
-#include <svtools/optionsdrawinglayer.hxx>
-#include <vcl/mapmod.hxx>
-#include <vcl/vclptr.hxx>
-
-namespace basegfx {
- class BColor;
- class B2DPolygon;
-}
-
-namespace com { namespace sun { namespace star { namespace rendering {
- class XCanvas;
- class XPolyPolygon2D;
-}}}}
-
-namespace drawinglayer { namespace primitive2d {
- class MaskPrimitive2D;
- class MetafilePrimitive2D;
- class TextSimplePortionPrimitive2D;
- class BitmapPrimitive2D;
- class TransparencePrimitive2D;
- class PolygonStrokePrimitive2D;
- class FillBitmapPrimitive2D;
- class UnifiedTransparencePrimitive2D;
-}}
-
-namespace drawinglayer
-{
- namespace processor2d
- {
- /** canvasProcessor2D class
-
- A basic implementation of a renderer for css::rendering::XCanvas
- as a target
- */
- class DRAWINGLAYER_DLLPUBLIC canvasProcessor2D : public BaseProcessor2D
- {
- private:
- // the (current) destination OutDev and canvas
- VclPtr<OutputDevice> mpOutputDevice;
- css::uno::Reference< css::rendering::XCanvas > mxCanvas;
- css::rendering::ViewState maViewState;
- css::rendering::RenderState maRenderState;
-
- // the modifiedColorPrimitive stack
- basegfx::BColorModifierStack maBColorModifierStack;
-
- // SvtOptionsDrawinglayer incarnation to react on diverse settings
- const SvtOptionsDrawinglayer maDrawinglayerOpt;
-
- // the current clipping tools::PolyPolygon from MaskPrimitive2D, always in
- // object coordinates
- basegfx::B2DPolyPolygon maClipPolyPolygon;
-
- // determined LanguageType
- LanguageType meLang;
-
- // as tooling, the process() implementation takes over API handling and calls this
- // virtual render method when the primitive implementation is BasePrimitive2D-based.
- virtual void processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate);
-
- // direct primitive renderer support
- void impRenderMaskPrimitive2D(const primitive2d::MaskPrimitive2D& rMaskCandidate);
- void impRenderMetafilePrimitive2D(const primitive2d::MetafilePrimitive2D& rMetaCandidate);
- void impRenderTextSimplePortionPrimitive2D(const primitive2d::TextSimplePortionPrimitive2D& rTextCandidate);
- void impRenderBitmapPrimitive2D(const primitive2d::BitmapPrimitive2D& rBitmapCandidate);
- void impRenderTransparencePrimitive2D(const primitive2d::TransparencePrimitive2D& rTransparenceCandidate);
- void impRenderPolygonStrokePrimitive2D(const primitive2d::PolygonStrokePrimitive2D& rPolygonStrokePrimitive);
- void impRenderFillBitmapPrimitive2D(const primitive2d::FillBitmapPrimitive2D& rFillBitmapPrimitive2D);
- void impRenderUnifiedTransparencePrimitive2D(const primitive2d::UnifiedTransparencePrimitive2D& rUniTransparenceCandidate);
-
- public:
- canvasProcessor2D(
- const geometry::ViewInformation2D& rViewInformation,
- OutputDevice& rOutDev);
- virtual ~canvasProcessor2D();
-
- // access to Drawinglayer configuration options
- const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; }
- };
- } // end of namespace processor2d
-} // end of namespace drawinglayer
-
-#endif // INCLUDED_DRAWINGLAYER_PROCESSOR2D_CANVASPROCESSOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */