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 /vcl | |
| parent | 75ea03d8423bdcce241149540a636d6156027d65 (diff) | |
avoid problems with poppler's and vcl's FontInfo during runtime
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/metric.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 6 | ||||
| -rw-r--r-- | vcl/workben/svptest.cxx | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx index f4b786c044b9..5ed467ef912e 100644 --- a/vcl/source/gdi/metric.cxx +++ b/vcl/source/gdi/metric.cxx @@ -67,6 +67,8 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const return true; } +namespace vcl { + FontInfo::FontInfo() : mpImplMetric( new ImplFontMetric ) {} @@ -113,8 +115,10 @@ FontType FontInfo::GetType() const return (mpImplMetric->IsScalable() ? TYPE_SCALABLE : TYPE_RASTER); } -FontMetric::FontMetric( const FontMetric& rMetric ) -: FontInfo( rMetric ) +} + +FontMetric::FontMetric( const FontMetric& rMetric ): + vcl::FontInfo( rMetric ) {} long FontMetric::GetAscent() const @@ -149,13 +153,13 @@ long FontMetric::GetSlant() const FontMetric& FontMetric::operator =( const FontMetric& rMetric ) { - FontInfo::operator=( rMetric ); + vcl::FontInfo::operator=( rMetric ); return *this; } bool FontMetric::operator==( const FontMetric& rMetric ) const { - return FontInfo::operator==( rMetric ); + return vcl::FontInfo::operator==( rMetric ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 6de4765e7093..7104caa95a13 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -58,12 +58,12 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::rtl; -using namespace ::vcl; using namespace ::utl; +using namespace ::vcl; -FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const +vcl::FontInfo OutputDevice::GetDevFont( int nDevFontIndex ) const { - FontInfo aFontInfo; + vcl::FontInfo aFontInfo; ImplInitFontList(); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index 019398a6168e..2ccde8f781d9 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -241,7 +241,7 @@ void MyWin::Paint( const Rectangle& rRect ) for( int i = 0; i < nFontSamples; ++i ) { - FontInfo aFont = GetDevFont( (i*nFontCount) / nFontSamples ); + vcl::FontInfo aFont = GetDevFont( (i*nFontCount) / nFontSamples ); aFont.SetHeight( 400 + (i%7) * 100 ); aFont.SetOrientation( i * (3600 / nFontSamples) ); SetFont( aFont ); |