diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-04 07:48:15 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-04 07:49:15 +0200 |
| commit | f634cda2a26aba91277738f2c6f09405a2bf915c (patch) | |
| tree | a9fc64974c8d1a20b02d69d0b4aeb84bb619dbf8 /include/vcl | |
| parent | 75ea03d8423bdcce241149540a636d6156027d65 (diff) | |
avoid problems with poppler's and vcl's FontInfo during runtime
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/metric.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 7 |
2 files changed, 13 insertions, 4 deletions
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 10a61fbf4dcf..160b9b377d69 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -22,18 +22,21 @@ #include <vcl/dllapi.h> #include <vcl/font.hxx> +#include <vcl/outdev.hxx> class ImplFontMetric; class ImplFontCharMap; typedef sal_uInt32 sal_UCS4; +namespace vcl { + +// avoid problems where poppler's FontInfo is picked up class VCL_DLLPUBLIC FontInfo : public Font { friend class OutputDevice; protected: - ImplFontMetric* mpImplMetric; // Implementation public: FontInfo(); @@ -46,9 +49,12 @@ public: bool operator==( const FontInfo& ) const; bool operator!=( const FontInfo& rInfo ) const { return !operator==( rInfo ); } + ImplFontMetric* mpImplMetric; // Implementation }; -class VCL_DLLPUBLIC FontMetric : public FontInfo +} + +class VCL_DLLPUBLIC FontMetric : public vcl::FontInfo { public: FontMetric() {} diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index de51dc49deaa..1a8c67623282 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -81,7 +81,6 @@ class BitmapReadAccess; class BitmapEx; class Image; class TextRectInfo; -class FontInfo; class FontMetric; class GDIMetaFile; class GfxLink; @@ -230,6 +229,10 @@ class FontSelectPattern; class ImplFontMetricData; class VCLXGraphics; +namespace vcl { + class FontInfo; +} + typedef ::std::vector< VCLXGraphics* > VCLXGraphicsList_impl; sal_uLong AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix ); @@ -1124,7 +1127,7 @@ private: public: - FontInfo GetDevFont( int nDevFontIndex ) const; + vcl::FontInfo GetDevFont( int nDevFontIndex ) const; int GetDevFontCount() const; bool IsFontAvailable( const OUString& rFontName ) const; |