Skip to content

C
core
Kaydet (Commit) dac6e46f authored tarafından Elton Chung's avatar Elton Chung Kaydeden (comit) Michael Meeks
Dosyalara gözat
Seçenekler

Remove unused code

üst 0536df54
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 53 deletions
canvas/inc/canvas/canvastools.hxx
Dosyayı görüntüle @ dac6e46f
...@@ -183,18 +183,10 @@ namespace canvas ...@@ -183,18 +183,10 @@ namespace canvas
setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState, setRenderStateTransform( ::com::sun::star::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform ); 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& CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
appendToRenderState( ::com::sun::star::rendering::RenderState& renderState, appendToRenderState( ::com::sun::star::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform ); 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& CANVASTOOLS_DLLPUBLIC ::com::sun::star::rendering::RenderState&
prependToRenderState( ::com::sun::star::rendering::RenderState& renderState, prependToRenderState( ::com::sun::star::rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& transform ); const ::basegfx::B2DHomMatrix& transform );
...@@ -204,13 +196,6 @@ namespace canvas ...@@ -204,13 +196,6 @@ namespace canvas
const ::com::sun::star::rendering::ViewState& viewState, const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState ); 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 // Matrix utilities
// =================================================================== // ===================================================================
......
canvas/source/tools/canvastools.cxx
Dosyayı görüntüle @ dac6e46f
...@@ -181,15 +181,6 @@ namespace canvas ...@@ -181,15 +181,6 @@ namespace canvas
return setRenderStateTransform( renderState, transform * rTransform ); 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, rendering::RenderState& prependToRenderState( rendering::RenderState& renderState,
const ::basegfx::B2DHomMatrix& rTransform ) const ::basegfx::B2DHomMatrix& rTransform )
{ {
...@@ -199,15 +190,6 @@ namespace canvas ...@@ -199,15 +190,6 @@ namespace canvas
return setRenderStateTransform( renderState, rTransform * transform ); 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, ::basegfx::B2DHomMatrix& mergeViewAndRenderTransform( ::basegfx::B2DHomMatrix& combinedTransform,
const rendering::ViewState& viewState, const rendering::ViewState& viewState,
const rendering::RenderState& renderState ) const rendering::RenderState& renderState )
...@@ -223,23 +205,6 @@ namespace canvas ...@@ -223,23 +205,6 @@ namespace canvas
return combinedTransform; 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 ) geometry::AffineMatrix2D& setIdentityAffineMatrix2D( geometry::AffineMatrix2D& matrix )
{ {
matrix.m00 = 1.0; matrix.m00 = 1.0;
......
unusedcode.easy
Dosyayı görüntüle @ dac6e46f
...@@ -1107,11 +1107,8 @@ canvas::ParametricPolyPolygon::ParametricPolyPolygon(com::sun::star::uno::Refere ...@@ -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::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::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
canvas::tools::ElapsedTime::getTimeBase() 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::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::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::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) 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&) cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> const&)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment