diff options
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/color.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/engine/tools.cxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/rgbcolor.hxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/tools.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index 374508393753..a7a957e7f423 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -277,7 +277,7 @@ namespace slideshow { } - RGBColor::RGBColor( ::cppcanvas::Color::IntSRGBA nRGBColor ) : + RGBColor::RGBColor( ::cppcanvas::IntSRGBA nRGBColor ) : maRGBTriple( ::cppcanvas::getRed( nRGBColor ) / 255.0, ::cppcanvas::getGreen( nRGBColor ) / 255.0, ::cppcanvas::getBlue( nRGBColor ) / 255.0 ) @@ -297,7 +297,7 @@ namespace slideshow } - ::cppcanvas::Color::IntSRGBA RGBColor::getIntegerColor() const + ::cppcanvas::IntSRGBA RGBColor::getIntegerColor() const { return ::cppcanvas::makeColor( colorToInt( getRed() ), colorToInt( getGreen() ), diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index eaac078f459e..db3fbcdfa452 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -649,7 +649,7 @@ namespace slideshow static_cast< sal_uInt8 >( nColor >> 24U ) ) ); } - sal_Int32 RGBAColor2UnoColor( ::cppcanvas::Color::IntSRGBA aColor ) + sal_Int32 RGBAColor2UnoColor( ::cppcanvas::IntSRGBA aColor ) { return ::cppcanvas::makeColorARGB( // convert from IntSRGBA color to API color @@ -662,7 +662,7 @@ namespace slideshow void fillRect( const ::cppcanvas::CanvasSharedPtr& rCanvas, const ::basegfx::B2DRectangle& rRect, - ::cppcanvas::Color::IntSRGBA aFillColor ) + ::cppcanvas::IntSRGBA aFillColor ) { const ::basegfx::B2DPolygon aPoly( ::basegfx::utils::createPolygonFromRect( rRect )); diff --git a/slideshow/source/inc/rgbcolor.hxx b/slideshow/source/inc/rgbcolor.hxx index 6028c1e889e9..9e12ec902a02 100644 --- a/slideshow/source/inc/rgbcolor.hxx +++ b/slideshow/source/inc/rgbcolor.hxx @@ -37,7 +37,7 @@ namespace slideshow { public: RGBColor(); - explicit RGBColor( ::cppcanvas::Color::IntSRGBA nRGBColor ); + explicit RGBColor( ::cppcanvas::IntSRGBA nRGBColor ); RGBColor( double nRed, double nGreen, double nBlue ); explicit RGBColor( const HSLColor& rColor ); @@ -55,7 +55,7 @@ namespace slideshow /** Create an integer sRGBA color. */ - ::cppcanvas::Color::IntSRGBA getIntegerColor() const; + ::cppcanvas::IntSRGBA getIntegerColor() const; struct RGBTriple { diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx index 646c646e7d62..1f4128d65199 100644 --- a/slideshow/source/inc/tools.hxx +++ b/slideshow/source/inc/tools.hxx @@ -261,13 +261,13 @@ namespace slideshow RGBColor unoColor2RGBColor( sal_Int32 ); /** Convert an IntSRGBA to plain UNO API 32 bit int */ - sal_Int32 RGBAColor2UnoColor( cppcanvas::Color::IntSRGBA ); + sal_Int32 RGBAColor2UnoColor( cppcanvas::IntSRGBA ); /** Fill a plain rectangle on the given canvas with the given color */ void fillRect( const std::shared_ptr< cppcanvas::Canvas >& rCanvas, const basegfx::B2DRange& rRect, - cppcanvas::Color::IntSRGBA aFillColor ); + cppcanvas::IntSRGBA aFillColor ); /** Init canvas with default background (white) */ |