From 90ca57da108d6e933c19e690ce82ef8da722523e Mon Sep 17 00:00:00 2001 From: ericb Date: Wed, 16 Dec 2009 08:20:42 +0100 Subject: eraser01: #i97972# yet some build issues due to rebase --- slideshow/source/engine/tools.cxx | 11 +++++++++++ slideshow/source/inc/userpainteventhandler.hxx | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'slideshow/source') diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx index 249375f99032..2f3a18744144 100644 --- a/slideshow/source/engine/tools.cxx +++ b/slideshow/source/engine/tools.cxx @@ -710,6 +710,17 @@ namespace slideshow static_cast< sal_uInt8 >( nColor >> 24U ) ) ); } + sal_Int32 RGBAColor2UnoColor( ::cppcanvas::Color::IntSRGBA aColor ) + { + return ::cppcanvas::makeColorARGB( + // convert from IntSRGBA color to API color + // (0xRRGGBBAA -> 0xAARRGGBB) + static_cast< sal_uInt8 >(0), + ::cppcanvas::getRed(aColor), + ::cppcanvas::getGreen(aColor), + ::cppcanvas::getBlue(aColor)); + } + /*sal_Int32 RGBAColor2UnoColor( ::cppcanvas::Color::IntSRGBA aColor ) { return ::cppcanvas::unMakeColor( diff --git a/slideshow/source/inc/userpainteventhandler.hxx b/slideshow/source/inc/userpainteventhandler.hxx index 8675ed4d5ae7..01919e0ae7e0 100644 --- a/slideshow/source/inc/userpainteventhandler.hxx +++ b/slideshow/source/inc/userpainteventhandler.hxx @@ -52,8 +52,8 @@ namespace slideshow public: virtual ~UserPaintEventHandler() {} virtual bool colorChanged( RGBColor const& rUserColor ) = 0; - virtual bool widthChanged( double nUserStrokeWidth ) = 0; - virtual bool eraseAllInkChanged(bool const& rEraseAllInk) =0; + virtual bool widthChanged( double nUserStrokeWidth ) = 0; + virtual bool eraseAllInkChanged(bool const& rEraseAllInk) =0; virtual bool eraseInkWidthChanged(sal_Int32 rEraseInkSize) =0; virtual bool switchEraserMode() = 0; virtual bool switchPenMode() = 0; -- cgit