summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-04 07:48:15 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-06-10 18:25:21 +0200
commitd4029e62e7e3e7f58840753b368b20ef87cb3c11 (patch)
tree08c98d2bb58327c94078592e521655427a97ee59 /vcl
parent191969ccaa65ee1e934cb3ebab9ef9a4aa3bcd5a (diff)
avoid problems with poppler's and vcl's FontInfo during runtime
Change-Id: I1dbd256812cccae1e6ed0ad8bb34ce427e5e5be8 Conflicts: include/vcl/metric.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx Conflicts: include/svtools/ctrltool.hxx include/vcl/metric.hxx include/vcl/outdev.hxx svtools/source/control/ctrlbox.cxx svtools/source/control/ctrltool.cxx svtools/source/control/stdmenu.cxx svx/source/sidebar/nbdtmg.cxx sw/source/core/uibase/docvw/srcedtw.cxx vcl/source/gdi/metric.cxx vcl/source/outdev/font.cxx
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/gdi/metric.cxx12
-rw-r--r--vcl/workben/svptest.cxx2
2 files changed, 8 insertions, 6 deletions
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index d708ca297243..2872ada03744 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -76,7 +76,7 @@ bool ImplFontMetric::operator==( const ImplFontMetric& r ) const
return true;
}
-// =======================================================================
+namespace vcl {
FontInfo::FontInfo()
: mpImplMetric( new ImplFontMetric )
@@ -134,8 +134,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 )
{}
// -----------------------------------------------------------------------
@@ -184,7 +186,7 @@ long FontMetric::GetSlant() const
FontMetric& FontMetric::operator =( const FontMetric& rMetric )
{
- FontInfo::operator=( rMetric );
+ vcl::FontInfo::operator=( rMetric );
return *this;
}
@@ -192,7 +194,7 @@ FontMetric& FontMetric::operator =( const FontMetric& rMetric )
sal_Bool FontMetric::operator==( const FontMetric& rMetric ) const
{
- return FontInfo::operator==( rMetric );
+ return vcl::FontInfo::operator==( rMetric );
}
// =======================================================================
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 52b13a0ccc17..b4fd044f995f 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -247,7 +247,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 );