mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop cairocanvas::ColorType enum

Browse Source 
since we only use the one enumerator value

Change-Id: Ifec39f4845348c753a6207795c62b27a7af1bbcd
This commit is contained in:
Noel Grandin
2017-02-16 16:08:20 +02:00
parent dc21a49ea3
commit 51d474abdb
1 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
canvas/source/cairo/cairo_canvashelper_text.cxx
View File

@@ -37,11 +37,6 @@ using namespace ::com::sun::star;
namespace cairocanvas namespace cairocanvas
{ {
enum ColorType
{
LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR
};
uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* , uno::Reference< rendering::XCanvasFont > CanvasHelper::createFont( const rendering::XCanvas* ,
const rendering::FontRequest& fontRequest, const rendering::FontRequest& fontRequest,
const uno::Sequence< beans::PropertyValue >& extraFontProperties, const uno::Sequence< beans::PropertyValue >& extraFontProperties,
@@ -114,14 +109,13 @@ namespace cairocanvas
setupOutDevState( OutputDevice& rOutDev, setupOutDevState( OutputDevice& rOutDev,
const rendering::XCanvas* pOwner, const rendering::XCanvas* pOwner,
const rendering::ViewState& viewState, const rendering::ViewState& viewState,
const rendering::RenderState& renderState, const rendering::RenderState& renderState )
ColorType eColorType )
{ {
::canvas::tools::verifyInput( renderState, ::canvas::tools::verifyInput( renderState,
OSL_THIS_FUNC, OSL_THIS_FUNC,
const_cast<rendering::XCanvas*>(pOwner), // only for refcount const_cast<rendering::XCanvas*>(pOwner), // only for refcount
2, 2,
eColorType == IGNORE_COLOR ? 0 : 3 ); 3 /* text */ );
int nTransparency(0); int nTransparency(0);
@@ -129,46 +123,20 @@ namespace cairocanvas
// state and change only when update is necessary // state and change only when update is necessary
::canvas::tools::clipOutDev(viewState, renderState, rOutDev); ::canvas::tools::clipOutDev(viewState, renderState, rOutDev);
if( eColorType != IGNORE_COLOR ) Color aColor( COL_WHITE );
if( renderState.DeviceColor.getLength() > 2 )
{ {
Color aColor( COL_WHITE ); aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor );
if( renderState.DeviceColor.getLength() > 2 )
{
aColor = vcl::unotools::stdColorSpaceSequenceToColor( renderState.DeviceColor );
}
// extract alpha, and make color opaque
// afterwards. Otherwise, OutputDevice won't draw anything
nTransparency = aColor.GetTransparency();
aColor.SetTransparency(0);
switch( eColorType )
{
case LINE_COLOR:
rOutDev.SetLineColor( aColor );
rOutDev.SetFillColor();
break;
case FILL_COLOR:
rOutDev.SetFillColor( aColor );
rOutDev.SetLineColor();
break;
case TEXT_COLOR:
rOutDev.SetTextColor( aColor );
break;
default:
ENSURE_OR_THROW( false,
"CanvasHelper::setupOutDevState(): Unexpected color type");
break;
}
} }
// extract alpha, and make color opaque
// afterwards. Otherwise, OutputDevice won't draw anything
nTransparency = aColor.GetTransparency();
aColor.SetTransparency(0);
rOutDev.SetTextColor( aColor );
return nTransparency; return nTransparency;
} }
@@ -204,7 +172,7 @@ namespace cairocanvas
const rendering::RenderState& renderState, const rendering::RenderState& renderState,
const uno::Reference< rendering::XCanvasFont >& xFont ) const uno::Reference< rendering::XCanvasFont >& xFont )
{ {
setupOutDevState( rOutDev, pOwner, viewState, renderState, TEXT_COLOR ); setupOutDevState( rOutDev, pOwner, viewState, renderState );
CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() ); CanvasFont* pFont = dynamic_cast< CanvasFont* >( xFont.get() );