From dac6e46f293581cba76556966f830ffeb9173596 Mon Sep 17 00:00:00 2001 From: Elton Chung Date: Sat, 11 Feb 2012 19:42:30 +0800 Subject: Remove unused code --- canvas/inc/canvas/canvastools.hxx | 15 --------------- canvas/source/tools/canvastools.cxx | 35 ----------------------------------- unusedcode.easy | 3 --- 3 files changed, 53 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; diff --git a/unusedcode.easy b/unusedcode.easy index 0f8acc11f34c..9a40c2f94647 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1107,11 +1107,8 @@ canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Refere canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector::MapEntry, std::allocator::MapEntry> > const&) canvas::createSurfaceProxyManager(boost::shared_ptr const&) canvas::tools::ElapsedTime::getTimeBase() const -canvas::tools::appendToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&) canvas::tools::calcRectToRectTransform(basegfx::B2DHomMatrix&, basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DHomMatrix const&) canvas::tools::clipBlit(basegfx::B2IRange&, basegfx::B2IPoint&, basegfx::B2IRange const&, basegfx::B2IRange const&) -canvas::tools::mergeViewAndRenderState(com::sun::star::rendering::ViewState&, com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference const&) -canvas::tools::prependToViewState(com::sun::star::rendering::ViewState&, basegfx::B2DHomMatrix const&) canvas::tools::verifyInput(com::sun::star::geometry::RealSize2D const&, char const*, com::sun::star::uno::Reference const&, short) canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference const&, short) cmis::Content::exchangeIdentity(com::sun::star::uno::Reference const&) -- cgit