diff options
Diffstat (limited to 'canvas/source/cairo')
| -rw-r--r-- | canvas/source/cairo/cairo_canvasfont.cxx | 4 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper_text.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_canvashelper_texturefill.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_devicehelper.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 452280728151..e90276f2ba33 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -78,7 +78,7 @@ namespace cairocanvas { maFont->SetAlign( ALIGN_BASELINE ); maFont->SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==com::sun::star::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? TRUE : FALSE ); + maFont->SetVertical( (rFontRequest.FontDescription.IsVertical==com::sun::star::util::TriState_YES) ? sal_True : sal_False ); // TODO(F2): improve panose->vclenum conversion maFont->SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); @@ -94,7 +94,7 @@ namespace cairocanvas if( pOutDev ) { const bool bOldMapState( pOutDev->IsMapModeEnabled() ); - pOutDev->EnableMapMode(FALSE); + pOutDev->EnableMapMode(sal_False); const Size aSize = pOutDev->GetFontMetric( *maFont ).GetSize(); diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 35310e1c078d..7e60d912e1ca 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -318,7 +318,7 @@ namespace cairocanvas return uno::Reference< rendering::XCachedPrimitive >(NULL); // no output necessary // change text direction and layout mode - ULONG nLayoutMode(0); + sal_uLong nLayoutMode(0); switch( textDirection ) { case rendering::TextDirection::WEAK_LEFT_TO_RIGHT: diff --git a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx index ee8aff6980cf..43447645daf9 100644 --- a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx +++ b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx @@ -82,7 +82,7 @@ namespace cairocanvas const ::Size& rTileSize, const GraphicAttr& rAttr) { - BOOL bRet( false ); + bool bRet( false ); Point aCurrPos; int nX, nY; diff --git a/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx index 70a5ea51c0ea..36f7a2452aa5 100644 --- a/canvas/source/cairo/cairo_devicehelper.cxx +++ b/canvas/source/cairo/cairo_devicehelper.cxx @@ -270,7 +270,7 @@ namespace cairocanvas const ::Point aEmptyPoint; bool bOldMap( mpRefDevice->IsMapModeEnabled() ); - mpRefDevice->EnableMapMode( FALSE ); + mpRefDevice->EnableMapMode( sal_False ); aStream << mpRefDevice->GetBitmap(aEmptyPoint, mpRefDevice->GetOutputSizePixel()); mpRefDevice->EnableMapMode( bOldMap ); diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index d0873b63f5f0..1da9197693ff 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -81,7 +81,7 @@ namespace cairocanvas sal_Int8 nTextDirection ) { // TODO(P3): avoid if already correctly set - ULONG nLayoutMode; + sal_uLong nLayoutMode; switch( nTextDirection ) { default: |