[Libreoffice-commits] core.git: 5 commits - include/sal include/vcl vcl/source

[Tor Lillqvist]

 include/sal/log-areas.dox  |    1 +
 include/vcl/fntstyle.hxx   |    5 -----
 include/vcl/font.hxx       |    2 +-
 include/vcl/metric.hxx     |   17 ++++++++++++++++-
 vcl/source/outdev/font.cxx |    2 ++
 5 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit c1dbed8ac63ffc3c9112c88b05398caaaca52dc7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 21 13:25:53 2014 +0300

    Use more specific tag
    
    Change-Id: Ife10cae3f0bd7dd294c74799412528f2596369c8

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 857302a..826872d 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -373,6 +373,7 @@ certain functionality.
 @li @c vcl.filter
 @li @c vcl.fonts - font-specific code
 @li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
+ at li @c vcl.gdi.fontmetric
 @li @c vcl.gtk - Gtk+ 2/3 plugin
 @li @c vcl.harfbuzz - HarfBuzz text layout
 @li @c vcl.headless - bitmap-based backend
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 008ad17..ef1f760 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -201,7 +201,7 @@ FontMetric OutputDevice::GetFontMetric() const
     aMetric.mpImplMetric->mnLineHeight  = ImplDevicePixelToLogicHeight( pMetric->mnAscent+pMetric->mnDescent+mnEmphasisAscent+mnEmphasisDescent );
     aMetric.mpImplMetric->mnSlant       = ImplDevicePixelToLogicHeight( pMetric->mnSlant );
 
-    SAL_INFO("vcl.gdi", "OutputDevice::GetFontMetric:" << aMetric);
+    SAL_INFO("vcl.gdi.fontmetric", "OutputDevice::GetFontMetric:" << aMetric);
 
     return aMetric;
 }
commit 02dcdb10111b9c5f644cbded01c6da688e807dac
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 21 13:25:30 2014 +0300

    Log also the size
    
    Change-Id: I391fbc092b05600b0a4c2107e3934e1fb7334554

diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index d9649ba..5e0b134 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -25,6 +25,7 @@
 #include <vcl/dllapi.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/color.hxx>
+#include <tools/gen.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/fntstyle.hxx>
 
@@ -33,7 +34,6 @@ class SvStream;
 
 class Impl_Font;
 class ImplFontAttributes;
-class Size;
 
 class VCL_DLLPUBLIC Font
 {
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index f1be383..8e0957a 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -76,13 +76,13 @@ public:
                             { return !operator==( rMetric ); }
 };
 
-
 template< typename charT, typename traits >
 inline std::basic_ostream<charT, traits> & operator <<(
     std::basic_ostream<charT, traits> & stream, const FontMetric& rMetric )
 {
     stream << "{"
            << "name=" << "\"" << rMetric.GetName() << "\""
+           << ",size=(" << rMetric.GetSize().Width() << "," << rMetric.GetSize().Height() << ")"
            << ",ascent=" << rMetric.GetAscent()
            << ",descent=" << rMetric.GetDescent()
            << ",intLeading=" << rMetric.GetIntLeading()
commit e2565690b5d1814d21c1df9bfeefe971e0265738
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 21 12:06:58 2014 +0300

    Bin ENUM_FONTRELIEF_DECLARED crack
    
    We don't test or define it anywhere else so the header guard for the file
    itself is enough.
    
    Change-Id: I15a81b50ab3250a9c792a1b86a4b15f49ec224d1

diff --git a/include/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx
index 643d5d2..e2fc652 100644
--- a/include/vcl/fntstyle.hxx
+++ b/include/vcl/fntstyle.hxx
@@ -22,13 +22,8 @@
 
 #include <sal/types.h>
 
-#ifndef ENUM_FONTRELIEF_DECLARED
-#define ENUM_FONTRELIEF_DECLARED
-
 enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
 
-#endif
-
 typedef sal_uInt8 FontKerning;
 #define KERNING_FONTSPECIFIC        ((FontKerning)0x01)
 #define KERNING_ASIAN               ((FontKerning)0x02)
commit 566e47a19ded7c4864c0b1b4a6372a69bc22cc54
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 21 11:43:14 2014 +0300

    Add a SAL_INFO
    
    Change-Id: I3eb6a1f7dab30346a68050f37d31c082336ab7b6

diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 541df8ef..008ad17 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -201,6 +201,8 @@ FontMetric OutputDevice::GetFontMetric() const
     aMetric.mpImplMetric->mnLineHeight  = ImplDevicePixelToLogicHeight( pMetric->mnAscent+pMetric->mnDescent+mnEmphasisAscent+mnEmphasisDescent );
     aMetric.mpImplMetric->mnSlant       = ImplDevicePixelToLogicHeight( pMetric->mnSlant );
 
+    SAL_INFO("vcl.gdi", "OutputDevice::GetFontMetric:" << aMetric);
+
     return aMetric;
 }
 
commit 6da81bb513399fe2008b002417bdfb4de68ea341
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed May 21 11:43:00 2014 +0300

    Add debugging output operator<< for FontMetric
    
    Change-Id: I8df204b01a73454396561052f10784c71f10d081

diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index 27a8498..f1be383 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -77,8 +77,23 @@ public:
 };
 
 
-// - FontCharMap -
+template< typename charT, typename traits >
+inline std::basic_ostream<charT, traits> & operator <<(
+    std::basic_ostream<charT, traits> & stream, const FontMetric& rMetric )
+{
+    stream << "{"
+           << "name=" << "\"" << rMetric.GetName() << "\""
+           << ",ascent=" << rMetric.GetAscent()
+           << ",descent=" << rMetric.GetDescent()
+           << ",intLeading=" << rMetric.GetIntLeading()
+           << ",extLeading=" << rMetric.GetExtLeading()
+           << ",lineHeight=" << rMetric.GetLineHeight()
+           << ",slant=" << rMetric.GetSlant()
+           << "}";
+    return stream;
+}
 
+// - FontCharMap -
 
 class VCL_DLLPUBLIC FontCharMap
 {