diff options
Diffstat (limited to 'canvas/source/directx/dx_textlayout_drawhelper.cxx')
| -rw-r--r-- | canvas/source/directx/dx_textlayout_drawhelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 1e4e83b6f715..fb8e184f9cc6 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -89,7 +89,7 @@ namespace dxcanvas if(rText.Length) { - sal_Bool test = mxGraphicDevice.is(); + bool test = mxGraphicDevice.is(); ENSURE_OR_THROW( test, "TextLayoutDrawHelper::drawText(): Invalid GraphicDevice" ); @@ -112,7 +112,7 @@ namespace dxcanvas aFont.SetAlignment( ALIGN_BASELINE ); aFont.SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==css::util::TriState_YES) ? sal_True : sal_False ); + aFont.SetVertical( rFontRequest.FontDescription.IsVertical==css::util::TriState_YES ); aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL ); aFont.SetPitch( @@ -235,7 +235,7 @@ namespace dxcanvas // metrics when e.g. formatting for a printer! SystemGraphicsData aSystemGraphicsData; aSystemGraphicsData.nSize = sizeof(SystemGraphicsData); - aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(GetDC( NULL )); + aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(GetDC( nullptr )); ScopedVclPtrInstance<VirtualDevice> xVirtualDevice(&aSystemGraphicsData, Size(1, 1), DeviceFormat::DEFAULT); // create the font @@ -247,7 +247,7 @@ namespace dxcanvas aFont.SetAlignment( ALIGN_BASELINE ); aFont.SetCharSet( (rFontRequest.FontDescription.IsSymbolFont==css::util::TriState_YES) ? RTL_TEXTENCODING_SYMBOL : RTL_TEXTENCODING_UNICODE ); - aFont.SetVertical( (rFontRequest.FontDescription.IsVertical==css::util::TriState_YES) ? sal_True : sal_False ); + aFont.SetVertical( rFontRequest.FontDescription.IsVertical==css::util::TriState_YES ); aFont.SetWeight( static_cast<FontWeight>(rFontRequest.FontDescription.FontDescription.Weight) ); aFont.SetItalic( (rFontRequest.FontDescription.FontDescription.Letterform<=8) ? ITALIC_NONE : ITALIC_NORMAL ); aFont.SetPitch( |