[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/vcl

[Markus Mohrhard]

 include/vcl/metric.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fab363401c0fc8c527cfad6a884b73391773077a
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed Jun 4 23:37:40 2014 +0200

    make that variable protected again
    
    Change-Id: I17235397e490458c250165c36bec97bf1ce326d7
    Reviewed-on: https://gerrit.libreoffice.org/9721
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 1836cce..e746e57 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -33,9 +33,10 @@ namespace vcl {
 
 class VCL_DLLPUBLIC FontInfo : public Font
 {
-    friend class OutputDevice;
+    friend class ::OutputDevice;
 
 protected:
+    ImplFontMetric*     mpImplMetric;    // Implementation
 
 public:
                         FontInfo();
@@ -48,7 +49,6 @@ public:
     sal_Bool                operator==( const FontInfo& ) const;
     sal_Bool                operator!=( const FontInfo& rInfo ) const
                             { return !operator==( rInfo ); }
-    ImplFontMetric*     mpImplMetric;    // Implementation
 };
 
 }