vcl/inc/impfont.hxx       |   53 ------------------------
 vcl/inc/impfontmetric.hxx |   89 +++++++++++++++++++++++++++++++++++++++++
 vcl/source/gdi/metric.cxx |   99 +++++++++++++++++++++++-----------------------
 3 files changed, 140 insertions(+), 101 deletions(-)

New commits:
commit 9b0c3d99e667c532428193e020b9133dd6287bcc
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date:   Thu Jan 14 09:34:59 2016 +1100

    vcl: split off ImplFontMetric into impfontmetric.hxx
    
    The fact that there is now an impfontmetricdata.hxx and an
    impfontmetric.hxx file in the same folder highlights the need
    for refactoring :-)
    
    Change-Id: Ic81f32cfa8523dccabe7b419bf97f1566e2d67da

diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 09a78bc..66d9cc2 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -87,59 +87,6 @@ private:
     friend SvStream&    WriteImplFont( SvStream& rOStm, const ImplFont& );
 };
 
-// - ImplFontMetric -
-
-class ImplFontMetric
-{
-private:
-    long                mnAscent;      // Ascent
-    long                mnDescent;     // Descent
-    long                mnIntLeading;  // Internal Leading
-    long                mnExtLeading;  // External Leading
-    long                mnLineHeight;  // Ascent+Descent+EmphasisMark
-    long                mnSlant;       // Slant
-    long                mnBulletOffset;// Offset for non-printing character
-    sal_uInt32          mnRefCount;    // Reference Counter
-
-    bool                mbScalableFont;
-    bool                mbFullstopCentered;
-    bool                mbDevice;
-
-public:
-
-    bool                operator==( const ImplFontMetric& ) const;
-
-                        ImplFontMetric();
-    void                AddReference();
-    void                DeReference();
-
-    long                GetAscent() const                           { return 
mnAscent; }
-    long                GetDescent() const                          { return 
mnDescent; }
-    long                GetInternalLeading() const                  { return 
mnIntLeading; }
-    long                GetExternalLeading() const                  { return 
mnExtLeading; }
-    long                GetLineHeight() const                       { return 
mnLineHeight; }
-    long                GetSlant() const                            { return 
mnSlant; }
-    long                GetBulletOffset() const                     { return 
mnBulletOffset; }
-
-    void                SetAscent( long nAscent )                   { mnAscent 
= nAscent; }
-    void                SetDescent( long nDescent )                 { 
mnDescent = nDescent; }
-    void                SetInternalLeading( long nIntLeading )      { 
mnIntLeading = nIntLeading; }
-    void                SetExternalLeading( long nExtLeading )      { 
mnExtLeading = nExtLeading; }
-    void                SetLineHeight( long nHeight )               { 
mnLineHeight = nHeight; }
-    void                SetSlant( long nSlant )                     { mnSlant 
= nSlant; }
-    void                SetBulletOffset( long nOffset )             { 
mnBulletOffset = nOffset; }
-
-    bool                IsScalable() const                          { return 
mbScalableFont; }
-    bool                IsFullstopCentered() const                  { return 
mbFullstopCentered; }
-    bool                IsBuiltInFont() const                       { return 
mbDevice; }
-
-    void                SetScalableFlag( bool bScalable )           { 
mbScalableFont = bScalable; }
-    void                SetFullstopCenteredFlag( bool bCentered )   { 
mbFullstopCentered = bCentered; }
-    void                SetBuiltInFontFlag( bool bIsBuiltInFont )   { mbDevice 
= bIsBuiltInFont; }
-
-};
-
-
 #endif // INCLUDED_VCL_INC_IMPFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/impfontmetric.hxx b/vcl/inc/impfontmetric.hxx
new file mode 100644
index 0000000..1d25aaf
--- /dev/null
+++ b/vcl/inc/impfontmetric.hxx
@@ -0,0 +1,89 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_INC_IMPFONTMETRIC_HXX
+#define INCLUDED_VCL_INC_IMPFONTMETRIC_HXX
+
+#include <rtl/ustring.hxx>
+#include <tools/gen.hxx>
+#include <i18nlangtag/languagetag.hxx>
+#include <tools/color.hxx>
+#include <vcl/dllapi.h>
+#include <vcl/vclenum.hxx>
+#include <vcl/fntstyle.hxx>
+#include <fontinstance.hxx>
+
+#include <boost/intrusive_ptr.hpp>
+
+class ImplFontCharMap;
+typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr;
+
+class ImplFontMetric
+{
+private:
+    long                mnAscent;      // Ascent
+    long                mnDescent;     // Descent
+    long                mnIntLeading;  // Internal Leading
+    long                mnExtLeading;  // External Leading
+    long                mnLineHeight;  // Ascent+Descent+EmphasisMark
+    long                mnSlant;       // Slant
+    long                mnBulletOffset;// Offset for non-printing character
+    sal_uInt32          mnRefCount;    // Reference Counter
+
+    bool                mbScalableFont;
+    bool                mbFullstopCentered;
+    bool                mbDevice;
+
+public:
+
+    bool                operator==( const ImplFontMetric& ) const;
+
+                        ImplFontMetric();
+    void                AddReference();
+    void                DeReference();
+
+    long                GetAscent() const                           { return 
mnAscent; }
+    long                GetDescent() const                          { return 
mnDescent; }
+    long                GetInternalLeading() const                  { return 
mnIntLeading; }
+    long                GetExternalLeading() const                  { return 
mnExtLeading; }
+    long                GetLineHeight() const                       { return 
mnLineHeight; }
+    long                GetSlant() const                            { return 
mnSlant; }
+    long                GetBulletOffset() const                     { return 
mnBulletOffset; }
+
+    void                SetAscent( long nAscent )                   { mnAscent 
= nAscent; }
+    void                SetDescent( long nDescent )                 { 
mnDescent = nDescent; }
+    void                SetInternalLeading( long nIntLeading )      { 
mnIntLeading = nIntLeading; }
+    void                SetExternalLeading( long nExtLeading )      { 
mnExtLeading = nExtLeading; }
+    void                SetLineHeight( long nHeight )               { 
mnLineHeight = nHeight; }
+    void                SetSlant( long nSlant )                     { mnSlant 
= nSlant; }
+    void                SetBulletOffset( long nOffset )             { 
mnBulletOffset = nOffset; }
+
+    bool                IsScalable() const                          { return 
mbScalableFont; }
+    bool                IsFullstopCentered() const                  { return 
mbFullstopCentered; }
+    bool                IsBuiltInFont() const                       { return 
mbDevice; }
+
+    void                SetScalableFlag( bool bScalable )           { 
mbScalableFont = bScalable; }
+    void                SetFullstopCenteredFlag( bool bCentered )   { 
mbFullstopCentered = bCentered; }
+    void                SetBuiltInFontFlag( bool bIsBuiltInFont )   { mbDevice 
= bIsBuiltInFont; }
+
+};
+
+#endif // INCLUDED_VCL_INC_IMPFONTMETRIC_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index a24cc3f..eb7271d4 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -17,61 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <impfont.hxx>
 #include <vcl/metric.hxx>
+#include "impfontmetric.hxx"
 
 #include <vector>
 #include <set>
 
 #include <cstdio>
 
-ImplFontMetric::ImplFontMetric()
-:   mnAscent( 0 ),
-    mnDescent( 0 ),
-    mnIntLeading( 0 ),
-    mnExtLeading( 0 ),
-    mnLineHeight( 0 ),
-    mnSlant( 0 ),
-    mnBulletOffset( 0 ),
-    mnRefCount( 1 ),
-    mbScalableFont( false ),
-    mbFullstopCentered( false ),
-    mbDevice( false )
-{}
-
-inline void ImplFontMetric::AddReference()
-{
-    // TODO: disable refcounting on the default maps?
-    ++mnRefCount;
-}
-
-inline void ImplFontMetric::DeReference()
-{
-    // TODO: disable refcounting on the default maps?
-    if( --mnRefCount <= 0 )
-        delete this;
-}
-
-bool ImplFontMetric::operator==( const ImplFontMetric& r ) const
-{
-    if(    mbScalableFont     != r.mbScalableFont
-        || mbFullstopCentered != r.mbFullstopCentered
-        || mbDevice           != r.mbDevice) // mbDevice == built-in font flag
-        return false;
-    if( mnAscent     != r.mnAscent )
-        return false;
-    if( mnDescent    != r.mnDescent )
-        return false;
-    if( mnIntLeading != r.mnIntLeading )
-        return false;
-    if( mnExtLeading != r.mnExtLeading )
-        return false;
-    if( mnSlant      != r.mnSlant )
-        return false;
-
-    return true;
-}
-
 FontMetric::FontMetric()
 :   mpImplMetric( new ImplFontMetric )
 {}
@@ -218,4 +171,54 @@ void FontMetric::SetBuiltInFontFlag( bool bIsBuiltInFont )
     mpImplMetric->SetBuiltInFontFlag( bIsBuiltInFont );
 }
 
+
+
+ImplFontMetric::ImplFontMetric()
+:   mnAscent( 0 ),
+    mnDescent( 0 ),
+    mnIntLeading( 0 ),
+    mnExtLeading( 0 ),
+    mnLineHeight( 0 ),
+    mnSlant( 0 ),
+    mnBulletOffset( 0 ),
+    mnRefCount( 1 ),
+    mbScalableFont( false ),
+    mbFullstopCentered( false ),
+    mbDevice( false )
+{}
+
+inline void ImplFontMetric::AddReference()
+{
+    // TODO: disable refcounting on the default maps?
+    ++mnRefCount;
+}
+
+inline void ImplFontMetric::DeReference()
+{
+    // TODO: disable refcounting on the default maps?
+    if( --mnRefCount <= 0 )
+        delete this;
+}
+
+bool ImplFontMetric::operator==( const ImplFontMetric& r ) const
+{
+    if(    mbScalableFont     != r.mbScalableFont
+        || mbFullstopCentered != r.mbFullstopCentered
+        || mbDevice           != r.mbDevice) // mbDevice == built-in font flag
+        return false;
+    if( mnAscent     != r.mnAscent )
+        return false;
+    if( mnDescent    != r.mnDescent )
+        return false;
+    if( mnIntLeading != r.mnIntLeading )
+        return false;
+    if( mnExtLeading != r.mnExtLeading )
+        return false;
+    if( mnSlant      != r.mnSlant )
+        return false;
+
+    return true;
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to