[Libreoffice-commits] .: canvas/inc canvas/source unusedcode.easy

[Michael Meeks]

 canvas/inc/canvas/canvastools.hxx   |   15 ---------------
 canvas/source/tools/canvastools.cxx |   35 -----------------------------------
 unusedcode.easy                     |    3 ---
 3 files changed, 53 deletions(-)

New commits:
commit dac6e46f293581cba76556966f830ffeb9173596
Author: Elton Chung <elton at layerjet.com>
Date:   Sat Feb 11 19:42:30 2012 +0800

    Remove unused code

diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index 9138ea4..a1bee2d 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 c663d43..a089f54 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 0f8acc1..9a40c2f 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<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry, std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry> > const&)
 canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> 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<com::sun::star::rendering::XCanvas> 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<com::sun::star::uno::XInterface> const&, short)
 canvas::tools::verifyInput(com::sun::star::rendering::FloatingPointBitmapLayout const&, char const*, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, short)
 cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)