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 /svx/source/dialog/_bmpmask.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 'svx/source/dialog/_bmpmask.cxx')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index aca2ea65e989..962234304aa4 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -897,7 +897,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) case( META_FONT_ACTION ): { MetaFontAction* pAct = (MetaFontAction*) pAction; - Font aFont( pAct->GetFont() ); + vcl::Font aFont( pAct->GetFont() ); aCol = aFont.GetColor(); TEST_COLS(); |