diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/inc/canvas/canvastools.hxx | 15 | ||||
| -rw-r--r-- | canvas/source/tools/canvastools.cxx | 35 |
2 files changed, 0 insertions, 50 deletions
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx index 9138ea4734fe..a1bee2dc5bb9 100644 --- a/canvas/inc/canvas/canvastools.hxx +++ b/canvas/inc/canvas/canvastools.hxx @@ -183,18 +183,10 @@ namespace canvas setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& - appendToViewState( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); - CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); - CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& - prependToViewState( ::com::sun::star::rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& transform ); - CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState& prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& transform ); @@ -204,13 +196,6 @@ namespace canvas const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::RenderState& renderState ); - CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::ViewState& - mergeViewAndRenderState( ::com::sun::star::rendering::ViewState& resultViewState, - const ::com::sun::star::rendering::ViewState& viewState, - const ::com::sun::star::rendering::RenderState& renderState, - const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XCanvas >& xCanvas ); - // Matrix utilities // =================================================================== diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index c663d43b6338..a089f5430b6e 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -181,15 +181,6 @@ namespace canvas return setRenderStateTransform( renderState, transform * rTransform ); } - rendering::ViewState& appendToViewState( rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& rTransform ) - { - ::basegfx::B2DHomMatrix transform; - - getViewStateTransform( transform, viewState ); - return setViewStateTransform( viewState, transform * rTransform ); - } - rendering::RenderState& prependToRenderState( rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& rTransform ) { @@ -199,15 +190,6 @@ namespace canvas return setRenderStateTransform( renderState, rTransform * transform ); } - rendering::ViewState& prependToViewState( rendering::ViewState& viewState, - const ::basegfx::B2DHomMatrix& rTransform ) - { - ::basegfx::B2DHomMatrix transform; - - getViewStateTransform( transform, viewState ); - return setViewStateTransform( viewState, rTransform * transform ); - } - ::basegfx::B2DHomMatrix& mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& combinedTransform, const rendering::ViewState& viewState, const rendering::RenderState& renderState ) @@ -223,23 +205,6 @@ namespace canvas return combinedTransform; } - rendering::ViewState& mergeViewAndRenderState( rendering::ViewState& resultViewState, - const rendering::ViewState& viewState, - const rendering::RenderState& renderState, - const uno::Reference< rendering::XCanvas >& /*xCanvas*/ ) - { - ::basegfx::B2DHomMatrix aTmpMatrix; - geometry::AffineMatrix2D convertedMatrix; - - resultViewState.Clip = NULL; // TODO(F2): intersect clippings - - return setViewStateTransform( - resultViewState, - mergeViewAndRenderTransform( aTmpMatrix, - viewState, - renderState ) ); - } - geometry::AffineMatrix2D& setIdentityAffineMatrix2D( geometry::AffineMatrix2D& matrix ) { matrix.m00 = 1.0; |