diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-16 10:09:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-18 08:54:37 +0200 |
| commit | 60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch) | |
| tree | 17ff5aaa57f4d23e177f1fe423def1691139a4a8 /cppcanvas/source | |
| parent | 9c818268767d6a1c1bc731ae30c45883bab987e7 (diff) | |
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11
Font typedef.
Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'cppcanvas/source')
| -rw-r--r-- | cppcanvas/source/inc/implrenderer.hxx | 4 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/textaction.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index deb37655e59a..fe3d639e732e 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -37,7 +37,7 @@ class GDIMetaFile; class VirtualDevice; class Gradient; class Rectangle; -class Font; +namespace vcl { class Font; } class PolyPolygon; class Point; class MetaCommentAction; @@ -242,7 +242,7 @@ static float GetSwapFloat( SvStream& rSt ) ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvasFont > createFont( double& o_rFontRotation, - const ::Font& rFont, + const ::vcl::Font& rFont, const ActionFactoryParameters& rParms ) const; bool createActions( GDIMetaFile& rMtf, const ActionFactoryParameters& rParms, diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 837609a7d1a4..a111fab8983e 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -753,7 +753,7 @@ namespace cppcanvas } uno::Reference< rendering::XCanvasFont > ImplRenderer::createFont( double& o_rFontRotation, - const ::Font& rFont, + const vcl::Font& rFont, const ActionFactoryParameters& rParms ) const { rendering::FontRequest aFontRequest; @@ -824,7 +824,7 @@ namespace cppcanvas const sal_Int32 nFontWidthLog = rFontSizeLog.Width(); if( nFontWidthLog != 0 ) { - ::Font aTestFont = rFont; + vcl::Font aTestFont = rFont; aTestFont.SetWidth( 0 ); sal_Int32 nNormalWidth = rParms.mrVDev.GetFontMetric( aTestFont ).GetWidth(); if( nNormalWidth != nFontWidthLog ) @@ -1488,7 +1488,7 @@ namespace cppcanvas case META_FONT_ACTION: { ::cppcanvas::internal::OutDevState& rState = rStates.getState(); - const ::Font& rFont( static_cast<MetaFontAction*>(pCurrAct)->GetFont() ); + const vcl::Font& rFont( static_cast<MetaFontAction*>(pCurrAct)->GetFont() ); rState.xFont = createFont( rState.fontRotation, rFont, @@ -2985,7 +2985,7 @@ namespace cppcanvas ::cppcanvas::internal::OutDevState& rState = aStateStack.getState(); rState.xFont = createFont( rState.fontRotation, - ::Font(), // default font + ::vcl::Font(), // default font aParms ); } diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx index ca2ff167c1a3..fd4660709aee 100644 --- a/cppcanvas/source/mtfrenderer/textaction.cxx +++ b/cppcanvas/source/mtfrenderer/textaction.cxx @@ -1954,8 +1954,8 @@ namespace cppcanvas // (which is already contained in the render state // transformation matrix - otherwise, glyph polygons // will be rotated twice) - const ::Font aOrigFont( rVDev.GetFont() ); - ::Font aUnrotatedFont( aOrigFont ); + const vcl::Font aOrigFont( rVDev.GetFont() ); + vcl::Font aUnrotatedFont( aOrigFont ); aUnrotatedFont.SetOrientation(0); rVDev.SetFont( aUnrotatedFont ); |