revert vcl patch series that brok Mac and Windows

revert:
9bc2f3de8672e812f3a67541c6d7069b434a7e42
vcl: add comment about ImplFontMetric::{Get|Set}LineHeight()
26371f105bc44e04469ec03fc5bb12505e651c6b
vcl: FontAttributes::GetSlantType() -> FontAttributes::GetItalic()
2dd0b4317372b8022efe3911b38b4fa02956d8b9
vcl: font.hxx and metric.hxx cleanup, make ctors explicit and the dtor virtual
5ab13bf3ead3539e4ad847656da81e7eb6029652
vcl: tabify font.hxx
f99550dae55e40e49bf9c9875053fe2abb4c71ca
vcl: change Font::SetName() to Font::SetFamilyName()
2b297116cb6bb1061c43e5714e2609c8ee9f57d2
vcl: rename Font::GetName to Font::GetFamilyName

Change-Id: I23f38921187d66b970ca815eb30dda4222a2da62

1 files changed, 40 insertions, 49 deletions

diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index bf50ab7da401..c8a2c2df9037 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -43,57 +43,33 @@ namespace vcl {
 
 class VCL_DLLPUBLIC Font
 {
-public:
-    explicit            Font();
-                        Font( const Font& ); // TODO make me explicit
-    explicit            Font( const OUString& rFamilyName, const Size& );
-    explicit            Font( const OUString& rFamilyName, const OUString& rStyleName, const Size& );
-    explicit            Font( FontFamily eFamily, const Size& );
-    virtual             ~Font();
-
-    const OUString&     GetFamilyName() const;
-    FontFamily          GetFamily();
-    FontFamily          GetFamily() const;
-    const OUString&     GetStyleName() const;
-
-    FontWeight          GetWeight();
-    FontWeight          GetWeight() const;
-    FontItalic          GetItalic();
-    FontItalic          GetItalic() const;
-    FontPitch           GetPitch();
-    FontPitch           GetPitch() const;
-    FontWidth           GetWidthType();
-    FontWidth           GetWidthType() const;
-    rtl_TextEncoding    GetCharSet() const;
-    FontAlign           GetAlign() const;
-
-    bool                IsSymbolFont() const;
-
-    void                SetFamilyName( const OUString& rFamilyName );
-    void                SetStyleName( const OUString& rStyleName );
-    void                SetFamily( FontFamily );
-
-    void                SetPitch( FontPitch ePitch );
-    void                SetItalic( FontItalic );
-    void                SetWeight( FontWeight );
-    void                SetWidthType( FontWidth );
-    void                SetCharSet( rtl_TextEncoding );
-    void                SetAlign( FontAlign );
+private:
+    ImplFont*           mpImplFont;
+    void                MakeUnique();
 
-    void                SetSymbolFlag( bool );
+public:
+                        Font();
+                        Font( const Font& );
+                        Font( const OUString& rFamilyName, const Size& );
+                        Font( const OUString& rFamilyName, const OUString& rStyleName, const Size& );
+                        Font( FontFamily eFamily, const Size& );
+                        ~Font();
 
     // setting the color on the font is obsolete, the only remaining
     // valid use is for keeping backward compatibility with old MetaFiles
-    const Color&        GetColor() const;
-    const Color&        GetFillColor() const;
-
-    bool                IsTransparent() const;
-
     void                SetColor( const Color& );
+    const Color&        GetColor() const;
     void                SetFillColor( const Color& );
-
+    const Color&        GetFillColor() const;
     void                SetTransparent( bool bTransparent );
+    bool            IsTransparent() const;
+    void                SetAlign( FontAlign );
+    FontAlign           GetAlign() const;
 
+    void                SetName( const OUString& rFamilyName );
+    const OUString&     GetName() const;
+    void                SetStyleName( const OUString& rStyleName );
+    const OUString&     GetStyleName() const;
     void                SetSize( const Size& );
     const Size&         GetSize() const;
     void                SetHeight( long nHeight );
@@ -101,6 +77,14 @@ public:
     void                SetWidth( long nWidth );
     long                GetWidth() const;
 
+    void                SetFamily( FontFamily );
+    FontFamily          GetFamily();
+    FontFamily          GetFamily() const;
+    void                SetCharSet( rtl_TextEncoding );
+    rtl_TextEncoding    GetCharSet() const;
+    void                SetSymbolFlag( bool );
+    bool                IsSymbolFont() const;
+
     // Prefer LanguageTag over LanguageType
     void                SetLanguageTag( const LanguageTag & );
     const LanguageTag&  GetLanguageTag() const;
@@ -110,6 +94,9 @@ public:
     LanguageType        GetLanguage() const;
     void                SetCJKContextLanguage( LanguageType );
     LanguageType        GetCJKContextLanguage() const;
+    void                SetPitch( FontPitch ePitch );
+    FontPitch           GetPitch();
+    FontPitch           GetPitch() const;
 
     void                SetOrientation( short nLineOrientation );
     short               GetOrientation() const;
@@ -117,8 +104,17 @@ public:
     bool                IsVertical() const;
     void                SetKerning( FontKerning nKerning );
     FontKerning         GetKerning() const;
-    bool                IsKerning() const;
+    bool            IsKerning() const;
 
+    void                SetWeight( FontWeight );
+    FontWeight          GetWeight();
+    FontWeight          GetWeight() const;
+    void                SetWidthType( FontWidth );
+    FontWidth           GetWidthType();
+    FontWidth           GetWidthType() const;
+    void                SetItalic( FontItalic );
+    FontItalic          GetItalic();
+    FontItalic          GetItalic() const;
     void                SetOutline( bool bOutline );
     bool                IsOutline() const;
     void                SetShadow( bool bShadow );
@@ -149,11 +145,6 @@ public:
     friend VCL_DLLPUBLIC SvStream&  ::WriteFont( SvStream& rOStm, const vcl::Font& );
 
     static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
-
-private:
-    ImplFont*           mpImplFont;
-    void                MakeUnique();
-
 };
 
 }