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 /filter/source/graphicfilter/eos2met | |
| 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 'filter/source/graphicfilter/eos2met')
| -rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index a217c58f4d00..90fb53d52e5d 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -115,7 +115,7 @@ struct METGDIStackMember Color aLineColor; Color aFillColor; RasterOp eRasterOp; - Font aFont; + vcl::Font aFont; MapMode aMapMode; Rectangle aClipRect; }; @@ -135,7 +135,7 @@ private: Color aGDILineColor; Color aGDIFillColor; RasterOp eGDIRasterOp; - Font aGDIFont; + vcl::Font aGDIFont; MapMode aGDIMapMode; // currently ununsed! Rectangle aGDIClipRect; // currently ununsed! METGDIStackMember* pGDIStack; @@ -181,9 +181,9 @@ private: void WriteFieldId(sal_uInt32 nId); void CreateChrSets(const GDIMetaFile * pMTF); - void CreateChrSet(const Font & rFont); + void CreateChrSet(const vcl::Font & rFont); void WriteChrSets(); - sal_uInt8 FindChrSet(const Font & rFont); + sal_uInt8 FindChrSet(const vcl::Font & rFont); void WriteColorAttributeTable(sal_uInt32 nFieldId=4, BitmapPalette* pPalette=NULL, sal_uInt8 nBasePartFlags=0x40, sal_uInt8 nBasePartLCTID=0); @@ -422,7 +422,7 @@ void METWriter::CreateChrSets(const GDIMetaFile * pMTF) } -void METWriter::CreateChrSet(const Font & rFont) +void METWriter::CreateChrSet(const vcl::Font & rFont) { METChrSet * pCS; @@ -437,7 +437,7 @@ void METWriter::CreateChrSet(const Font & rFont) } -sal_uInt8 METWriter::FindChrSet(const Font & rFont) +sal_uInt8 METWriter::FindChrSet(const vcl::Font & rFont) { METChrSet* pCS; @@ -2523,7 +2523,7 @@ bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, Filt aGDILineColor=Color( COL_BLACK ); aGDIFillColor=Color( COL_WHITE ); eGDIRasterOp=ROP_OVERPAINT; - aGDIFont=Font(); + aGDIFont=vcl::Font(); aGDIMapMode=MapMode(); aGDIClipRect=Rectangle(); pGDIStack=NULL; |