diff options
Diffstat (limited to 'cppcanvas/source')
| -rw-r--r-- | cppcanvas/source/inc/tools.hxx | 14 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/bitmapaction.cxx | 6 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 5 | ||||
| -rw-r--r-- | cppcanvas/source/tools/tools.cxx | 6 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implcolor.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/implpolypolygon.cxx | 9 | ||||
| -rw-r--r-- | cppcanvas/source/wrapper/vclfactory.cxx | 4 |
7 files changed, 12 insertions, 34 deletions
diff --git a/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx index 63ee1dcf8a7f..80ded934203f 100644 --- a/cppcanvas/source/inc/tools.hxx +++ b/cppcanvas/source/inc/tools.hxx @@ -20,26 +20,16 @@ #ifndef INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX #define INCLUDED_CPPCANVAS_SOURCE_INC_TOOLS_HXX -#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <cppcanvas/color.hxx> -namespace com { namespace sun { namespace star { namespace rendering -{ - class XGraphicDevice; -} } } } - - namespace cppcanvas { namespace tools { - css::uno::Sequence< double > - intSRGBAToDoubleSequence( const css::uno::Reference< css::rendering::XGraphicDevice >&, - Color::IntSRGBA ); + css::uno::Sequence< double > intSRGBAToDoubleSequence( Color::IntSRGBA ); - Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Reference< css::rendering::XGraphicDevice >& rDevice, - const css::uno::Sequence< double >& rColor ); + Color::IntSRGBA doubleSequenceToIntSRGBA( const css::uno::Sequence< double >& rColor ); } } diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx index 2777abb7e24c..db8c597afcba 100644 --- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx +++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx @@ -84,8 +84,7 @@ namespace cppcanvas const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : CachedPrimitiveBase( rCanvas, true ), - mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), - rBmpEx ) ), + mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rBmpEx ) ), mpCanvas( rCanvas ), maState() { @@ -112,8 +111,7 @@ namespace cppcanvas const CanvasSharedPtr& rCanvas, const OutDevState& rState ) : CachedPrimitiveBase( rCanvas, true ), - mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), - rBmpEx ) ), + mxBitmap( vcl::unotools::xBitmapFromBitmapEx( rBmpEx ) ), mpCanvas( rCanvas ), maState() { diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 2a2f75c9f7d0..79887c892857 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1713,10 +1713,7 @@ namespace cppcanvas aMatrix ); aTexture.Alpha = 1.0 - aFill.getTransparency(); - aTexture.Bitmap = - vcl::unotools::xBitmapFromBitmapEx( - rCanvas->getUNOCanvas()->getDevice(), - aBmpEx ); + aTexture.Bitmap = vcl::unotools::xBitmapFromBitmapEx( aBmpEx ); if( aFill.isTiling() ) { aTexture.RepeatModeX = rendering::TexturingMode::REPEAT; diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx index db4dd13c2f59..6bf9c55433c4 100644 --- a/cppcanvas/source/tools/tools.cxx +++ b/cppcanvas/source/tools/tools.cxx @@ -27,8 +27,7 @@ namespace cppcanvas { namespace tools { - uno::Sequence< double > intSRGBAToDoubleSequence( const uno::Reference< rendering::XGraphicDevice >&, - Color::IntSRGBA aColor ) + uno::Sequence< double > intSRGBAToDoubleSequence( Color::IntSRGBA aColor ) { uno::Sequence< double > aRes( 4 ); @@ -40,8 +39,7 @@ namespace cppcanvas return aRes; } - Color::IntSRGBA doubleSequenceToIntSRGBA( const uno::Reference< rendering::XGraphicDevice >&, - const uno::Sequence< double >& rColor ) + Color::IntSRGBA doubleSequenceToIntSRGBA( const uno::Sequence< double >& rColor ) { return makeColor( static_cast<sal_uInt8>( 255*rColor[0] + .5 ), static_cast<sal_uInt8>( 255*rColor[1] + .5 ), diff --git a/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx index 1c69bb4251f3..a22fffe39c47 100644 --- a/cppcanvas/source/wrapper/implcolor.cxx +++ b/cppcanvas/source/wrapper/implcolor.cxx @@ -44,7 +44,7 @@ namespace cppcanvas OSL_ENSURE( mxDevice.is(), "ImplColor::getDeviceColor(): Invalid graphic device" ); // TODO(F1): Color space handling - return tools::intSRGBAToDoubleSequence( mxDevice, aSRGBA ); + return tools::intSRGBAToDoubleSequence( aSRGBA ); } } diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx index ddd3be37fddc..ab1504c78e5c 100644 --- a/cppcanvas/source/wrapper/implpolypolygon.cxx +++ b/cppcanvas/source/wrapper/implpolypolygon.cxx @@ -64,22 +64,19 @@ namespace cppcanvas void ImplPolyPolygon::setRGBAFillColor( Color::IntSRGBA aColor ) { - maFillColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), - aColor ); + maFillColor = tools::intSRGBAToDoubleSequence( aColor ); mbFillColorSet = true; } void ImplPolyPolygon::setRGBALineColor( Color::IntSRGBA aColor ) { - maStrokeColor = tools::intSRGBAToDoubleSequence( getGraphicDevice(), - aColor ); + maStrokeColor = tools::intSRGBAToDoubleSequence( aColor ); mbStrokeColorSet = true; } Color::IntSRGBA ImplPolyPolygon::getRGBALineColor() const { - return tools::doubleSequenceToIntSRGBA( getGraphicDevice(), - maStrokeColor ); + return tools::doubleSequenceToIntSRGBA( maStrokeColor ); } void ImplPolyPolygon::setStrokeWidth( const double& rStrokeWidth ) diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx index 4715e790d83e..de3b1f6176c9 100644 --- a/cppcanvas/source/wrapper/vclfactory.cxx +++ b/cppcanvas/source/wrapper/vclfactory.cxx @@ -81,9 +81,7 @@ namespace cppcanvas return BitmapSharedPtr(); return BitmapSharedPtr( new internal::ImplBitmap( rCanvas, - vcl::unotools::xBitmapFromBitmapEx( - xCanvas->getDevice(), - rBmpEx) ) ); + vcl::unotools::xBitmapFromBitmapEx(rBmpEx) ) ); } RendererSharedPtr VCLFactory::createRenderer( const CanvasSharedPtr& rCanvas, |