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 /drawinglayer/source/primitive2d/textlayoutdevice.cxx | |
| 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 'drawinglayer/source/primitive2d/textlayoutdevice.cxx')
| -rw-r--r-- | drawinglayer/source/primitive2d/textlayoutdevice.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index cbd21e37d898..c472d19ad768 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -155,7 +155,7 @@ namespace drawinglayer releaseGlobalVirtualDevice(); } - void TextLayouterDevice::setFont(const Font& rFont) + void TextLayouterDevice::setFont(const vcl::Font& rFont) { mrDevice.SetFont( rFont ); } @@ -365,7 +365,7 @@ namespace drawinglayer { namespace primitive2d { - Font getVclFontFromFontAttribute( + vcl::Font getVclFontFromFontAttribute( const attribute::FontAttribute& rFontAttribute, double fFontScaleX, double fFontScaleY, @@ -381,7 +381,7 @@ namespace drawinglayer // for WIN32 systems, start with creating an unscaled font. If FontScaling // is wanted, that width needs to be adapted using FontMetric again to get a // width of the unscaled font - Font aRetval( + vcl::Font aRetval( rFontAttribute.getFamilyName(), rFontAttribute.getStyleName(), Size(0, nHeight)); @@ -391,7 +391,7 @@ namespace drawinglayer // FontWidth when no scaling is used to explicitly have that zero when e.g. the // Font would be recorded in a MetaFile (The MetaFile FontAction WILL record a // set FontWidth; import that in a WIN32 system, and trouble is there) - Font aRetval( + vcl::Font aRetval( rFontAttribute.getFamilyName(), rFontAttribute.getStyleName(), Size(bFontIsScaled ? nWidth : 0, nHeight)); @@ -432,7 +432,7 @@ namespace drawinglayer attribute::FontAttribute getFontAttributeFromVclFont( basegfx::B2DVector& o_rSize, - const Font& rFont, + const vcl::Font& rFont, bool bRTL, bool bBiDiStrong) { |