diff options
Diffstat (limited to 'canvas/source')
| -rw-r--r-- | canvas/source/directx/dx_canvashelper.cxx | 3 | ||||
| -rw-r--r-- | canvas/source/tools/canvastools.cxx | 20 |
2 files changed, 9 insertions, 14 deletions
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx index 1184886784c9..bd3523a134b9 100644 --- a/canvas/source/directx/dx_canvashelper.cxx +++ b/canvas/source/directx/dx_canvashelper.cxx @@ -728,8 +728,7 @@ namespace dxcanvas "CanvasHelper::setupGraphicsState: reference device invalid" ); // setup view transform first. Clipping e.g. depends on it - ::basegfx::B2DHomMatrix aTransform; - ::canvas::tools::getViewStateTransform(aTransform, viewState); + ::basegfx::B2DHomMatrix aTransform = ::canvas::tools::getViewStateTransform(viewState); // add output offset if( !maOutputOffset.equalZero() ) diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index b77524351b96..4b227c0b1c0d 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -91,10 +91,10 @@ namespace canvas::tools return viewState; } - ::basegfx::B2DHomMatrix& getViewStateTransform( ::basegfx::B2DHomMatrix& transform, - const rendering::ViewState& viewState ) + ::basegfx::B2DHomMatrix getViewStateTransform( const rendering::ViewState& viewState ) { - return ::basegfx::unotools::homMatrixFromAffineMatrix( transform, viewState.AffineTransform ); + ::basegfx::B2DHomMatrix aTransform; + return ::basegfx::unotools::homMatrixFromAffineMatrix( aTransform, viewState.AffineTransform ); } rendering::ViewState& setViewStateTransform( rendering::ViewState& viewState, @@ -105,10 +105,10 @@ namespace canvas::tools return viewState; } - ::basegfx::B2DHomMatrix& getRenderStateTransform( ::basegfx::B2DHomMatrix& transform, - const rendering::RenderState& renderState ) + ::basegfx::B2DHomMatrix getRenderStateTransform( const rendering::RenderState& renderState ) { - return ::basegfx::unotools::homMatrixFromAffineMatrix( transform, renderState.AffineTransform ); + ::basegfx::B2DHomMatrix aTransform; + return ::basegfx::unotools::homMatrixFromAffineMatrix( aTransform, renderState.AffineTransform ); } rendering::RenderState& setRenderStateTransform( rendering::RenderState& renderState, @@ -122,18 +122,14 @@ namespace canvas::tools rendering::RenderState& appendToRenderState( rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& rTransform ) { - ::basegfx::B2DHomMatrix transform; - - getRenderStateTransform( transform, renderState ); + ::basegfx::B2DHomMatrix transform = getRenderStateTransform( renderState ); return setRenderStateTransform( renderState, transform * rTransform ); } rendering::RenderState& prependToRenderState( rendering::RenderState& renderState, const ::basegfx::B2DHomMatrix& rTransform ) { - ::basegfx::B2DHomMatrix transform; - - getRenderStateTransform( transform, renderState ); + ::basegfx::B2DHomMatrix transform = getRenderStateTransform( renderState ); return setRenderStateTransform( renderState, rTransform * transform ); } |