From d4029e62e7e3e7f58840753b368b20ef87cb3c11 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@collabora.co.uk>
Date: Wed, 4 Jun 2014 07:48:15 +0200
Subject: 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
---
 vcl/source/gdi/metric.cxx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'vcl/source/gdi/metric.cxx')

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 );
 }
 
 // =======================================================================
-- 
cgit v1.2.3