solenv/clang-format/excludelist | 2 +-
vcl/headless/svptext.cxx | 4 ++--
vcl/inc/font/FontMetricData.hxx | 10 +++++-----
vcl/inc/font/LogicalFontInstance.hxx | 4 ++--
vcl/inc/headless/svpgdi.hxx | 4 ++--
vcl/inc/qt5/QtGraphics.hxx | 2 +-
vcl/inc/quartz/salgdi.h | 6 +++---
vcl/inc/salgdi.hxx | 4 ++--
vcl/inc/textrender.hxx | 4 ++--
vcl/inc/unx/freetypetextrender.hxx | 2 +-
vcl/inc/unx/genpspgraphics.h | 4 ++--
vcl/inc/unx/glyphcache.hxx | 4 ++--
vcl/inc/unx/salgdi.h | 2 +-
vcl/inc/win/salgdi.h | 4 ++--
vcl/qt5/QtGraphics_Text.cxx | 2 +-
vcl/quartz/ctfonts.cxx | 4 ++--
vcl/quartz/salgdi.cxx | 4 ++--
vcl/source/font/LogicalFontInstance.cxx | 2 +-
vcl/source/font/fontmetric.cxx | 20 ++++++++++----------
vcl/source/outdev/font.cxx | 2 +-
vcl/unx/generic/fontmanager/fontconfig.cxx | 2 +-
vcl/unx/generic/gdi/font.cxx | 2 +-
vcl/unx/generic/gdi/freetypetextrender.cxx | 4 ++--
vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 2 +-
vcl/unx/generic/print/genpspgraphics.cxx | 4 ++--
vcl/win/gdi/salfont.cxx | 4 ++--
26 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 6ae13c5fc5b28efeb1f6b75d4f6574bae20af37c
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Mon Jul 3 10:56:31 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Mon Jul 3 15:05:04 2023 +0200
Rename and move header next to other font headers
Change-Id: I5485817b5a6c2e9538ed6fb00893663d09e7fa26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153869
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 2e454f9892dc..ca49c48b2f2f 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14248,7 +14248,7 @@ vcl/inc/impdel.hxx
vcl/inc/impfont.hxx
vcl/inc/impfontcache.hxx
vcl/inc/impfontcharmap.hxx
-vcl/inc/impfontmetricdata.hxx
+vcl/inc/font/FontMetricData.hxx
vcl/inc/impgraph.hxx
vcl/inc/implimagetree.hxx
vcl/inc/jobdata.hxx
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 427504fe18ea..297523b8b356 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -23,7 +23,7 @@
#include <vcl/fontcharmap.hxx>
#include <basegfx/range/b2ibox.hxx>
#include <headless/svpgdi.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <sallayout.hxx>
void SvpSalGraphics::SetFont(LogicalFontInstance* pIFSD, int nFallbackLevel)
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/font/FontMetricData.hxx
similarity index 99%
rename from vcl/inc/impfontmetricdata.hxx
rename to vcl/inc/font/FontMetricData.hxx
index d4b44bb60101..000a5a250bbd 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/font/FontMetricData.hxx
@@ -24,7 +24,7 @@
#include <vcl/dllapi.h>
#include <tools/long.hxx>
#include <tools/ref.hxx>
-#include "fontattributes.hxx"
+#include <fontattributes.hxx>
#include <vector>
diff --git a/vcl/inc/font/LogicalFontInstance.hxx
b/vcl/inc/font/LogicalFontInstance.hxx
index a50df83d7c48..2261246b069b 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -30,7 +30,7 @@
#include <tools/degree.hxx>
#include <font/FontSelectPattern.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <glyphid.hxx>
#include <optional>
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 5164a71cc51d..d341c1f8b2f9 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -34,7 +34,7 @@
#include <salgdi.hxx>
#include <sallayout.hxx>
#include <unx/cairotextrender.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <headless/SvpGraphicsBackend.hxx>
#include <headless/CairoCommon.hxx>
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 4b5faaab7c81..06b9b08b431d 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -48,7 +48,7 @@
#include <font/LogicalFontInstance.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <font/PhysicalFontFace.hxx>
#include <salgdi.hxx>
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index b273eab6434d..debdd34bb00f 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -23,7 +23,7 @@
#include <vcl/outdev.hxx>
-#include "impfontmetricdata.hxx"
+#include "font/FontMetricData.hxx"
#include "salgdiimpl.hxx"
#include "sallayout.hxx"
#include "SalGradient.hxx"
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index dcb3c2be9361..cd8f31ef0df2 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -34,7 +34,7 @@
#include <fontattributes.hxx>
#include <font/LogicalFontInstance.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <unordered_map>
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 333f55113c2f..4af4b28ffa2c 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -42,7 +42,7 @@
#include <quartz/ctfonts.hxx>
#include <fontsubset.hxx>
#include <impfont.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <font/fontsubstitution.hxx>
#include <font/PhysicalFontCollection.hxx>
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 0667dddf31ec..da927c8b4bb2 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -30,7 +30,7 @@
#include <font/FontSelectPattern.hxx>
#include <font/PhysicalFontFace.hxx>
#include <font/LogicalFontInstance.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <sft.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 75fa18146dd7..3a6891c7f8a8 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -34,7 +34,7 @@
#include <unx/fc_fontoptions.hxx>
#include <unx/freetype_glyphcache.hxx>
#include <font/PhysicalFontFace.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <sallayout.hxx>
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx
b/vcl/unx/generic/print/genpspgraphics.cxx
index 6cf66ac49aa3..24d0515c3b03 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -45,7 +45,7 @@
#include <langboost.hxx>
#include <font/LogicalFontInstance.hxx>
#include <fontattributes.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <font/FontSelectPattern.hxx>
#include <font/PhysicalFontCollection.hxx>
#include <font/PhysicalFontFace.hxx>
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 37afd63123b8..f4a3029a454f 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -71,7 +71,7 @@
#include <win/winlayout.hxx>
#include <win/wingdiimpl.hxx>
#include <impfontcharmap.hxx>
-#include <impfontmetricdata.hxx>
+#include <font/FontMetricData.hxx>
#include <impglyphitem.hxx>
#if HAVE_FEATURE_SKIA
commit 206f8b905dc00b86f9926a3ee6b503bd56bc0115
Author: Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Mon Jul 3 10:52:34 2023 +0300
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Mon Jul 3 15:04:55 2023 +0200
Rename ImplFontMetricData -> FontMetricData
Change-Id: I0f8753a5ef1865f4ea0431125e74d0f52aa1c396
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153868
Tested-by: Jenkins
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index a41d3df1705a..427504fe18ea 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -31,7 +31,7 @@ void SvpSalGraphics::SetFont(LogicalFontInstance* pIFSD, int
nFallbackLevel)
m_aTextRenderImpl.SetFont(pIFSD, nFallbackLevel);
}
-void SvpSalGraphics::GetFontMetric( ImplFontMetricDataRef& xFontMetric, int
nFallbackLevel )
+void SvpSalGraphics::GetFontMetric( FontMetricDataRef& xFontMetric, int
nFallbackLevel )
{
m_aTextRenderImpl.GetFontMetric(xFontMetric, nFallbackLevel);
}
diff --git a/vcl/inc/font/LogicalFontInstance.hxx
b/vcl/inc/font/LogicalFontInstance.hxx
index a5e8a6d3249e..a50df83d7c48 100644
--- a/vcl/inc/font/LogicalFontInstance.hxx
+++ b/vcl/inc/font/LogicalFontInstance.hxx
@@ -74,7 +74,7 @@ class VCL_PLUGIN_PUBLIC LogicalFontInstance : public
salhelper::SimpleReferenceO
public: // TODO: make data members private
virtual ~LogicalFontInstance() override;
- ImplFontMetricDataRef mxFontMetric; // Font attributes
+ FontMetricDataRef mxFontMetric; // Font attributes
const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol
tools::Long mnLineHeight;
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 29b7dd53c7c2..5164a71cc51d 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -71,7 +71,7 @@ public:
virtual void SetTextColor( Color nColor ) override;
virtual void SetFont(LogicalFontInstance*, int nFallbackLevel)
override;
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) override;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) override;
virtual FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities)
const override;
virtual void GetDevFontList( vcl::font::PhysicalFontCollection*
) override;
diff --git a/vcl/inc/impfontmetricdata.hxx b/vcl/inc/impfontmetricdata.hxx
index 63394a93eb23..d4b44bb60101 100644
--- a/vcl/inc/impfontmetricdata.hxx
+++ b/vcl/inc/impfontmetricdata.hxx
@@ -28,8 +28,8 @@
#include <vector>
-class ImplFontMetricData;
-typedef tools::SvRef<ImplFontMetricData> ImplFontMetricDataRef;
+class FontMetricData;
+typedef tools::SvRef<FontMetricData> FontMetricDataRef;
class OutputDevice;
namespace vcl::font
@@ -38,10 +38,10 @@ class FontSelectPattern;
}
class LogicalFontInstance;
-class VCL_DLLPUBLIC ImplFontMetricData final : public FontAttributes, public
SvRefBase
+class VCL_DLLPUBLIC FontMetricData final : public FontAttributes, public
SvRefBase
{
public:
- explicit ImplFontMetricData( const vcl::font::FontSelectPattern& );
+ explicit FontMetricData( const vcl::font::FontSelectPattern& );
// font instance attributes from the font request
tools::Long GetWidth() const
{ return mnWidth; }
diff --git a/vcl/inc/qt5/QtGraphics.hxx b/vcl/inc/qt5/QtGraphics.hxx
index ea227634017d..0bc7e20dee69 100644
--- a/vcl/inc/qt5/QtGraphics.hxx
+++ b/vcl/inc/qt5/QtGraphics.hxx
@@ -225,7 +225,7 @@ public:
virtual void SetTextColor(Color nColor) override;
virtual void SetFont(LogicalFontInstance*, int nFallbackLevel) override;
- virtual void GetFontMetric(ImplFontMetricDataRef&, int nFallbackLevel)
override;
+ virtual void GetFontMetric(FontMetricDataRef&, int nFallbackLevel)
override;
virtual FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities)
const override;
virtual void GetDevFontList(vcl::font::PhysicalFontCollection*) override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 009bf59e872e..4b5faaab7c81 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -90,7 +90,7 @@ class CoreTextFont final : public LogicalFontInstance
public:
~CoreTextFont() override;
- void GetFontMetric( ImplFontMetricDataRef const & );
+ void GetFontMetric( FontMetricDataRef const & );
bool GetGlyphOutline(sal_GlyphId, basegfx::B2DPolyPolygon&, bool) const
override;
CTFontRef GetCTFont() const { return mpCTFont; }
@@ -532,7 +532,7 @@ public:
// set the font
virtual void SetFont( LogicalFontInstance*, int nFallbackLevel
) override;
// get the current font's metrics
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) override;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) override;
// get the repertoire of the current font
virtual FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities
&rFontCapabilities) const override;
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index a7fbe287fc48..b273eab6434d 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -141,7 +141,7 @@ public:
void ReleaseFonts() { SetFont( nullptr, 0 ); }
// get the current font's metrics
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) = 0;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) = 0;
// get the repertoire of the current font
virtual FontCharMapRef GetFontCharMap() const = 0;
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index 028883f98f17..eb4af536e466 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -23,7 +23,7 @@
#include "salgdi.hxx"
-class ImplFontMetricData;
+class FontMetricData;
class PhysicalFontCollection;
namespace vcl::font { class PhysicalFontFace; }
@@ -36,7 +36,7 @@ public:
virtual void SetTextColor( Color nColor ) = 0;
virtual void SetFont(LogicalFontInstance*, int
nFallbackLevel) = 0;
void ReleaseFonts() { SetFont(nullptr, 0); }
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) = 0;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) = 0;
virtual FontCharMapRef GetFontCharMap() const = 0;
virtual bool GetFontCapabilities(vcl::FontCapabilities
&rFontCapabilities) const = 0;
virtual void GetDevFontList(
vcl::font::PhysicalFontCollection* ) = 0;
diff --git a/vcl/inc/unx/freetypetextrender.hxx
b/vcl/inc/unx/freetypetextrender.hxx
index fa961b33b158..63568db4985d 100644
--- a/vcl/inc/unx/freetypetextrender.hxx
+++ b/vcl/inc/unx/freetypetextrender.hxx
@@ -41,7 +41,7 @@ public:
virtual void SetTextColor( Color nColor ) override;
virtual void SetFont(LogicalFontInstance*, int
nFallbackLevel) override;
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) override;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) override;
virtual FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities
&rFontCapabilities) const override;
virtual void GetDevFontList(
vcl::font::PhysicalFontCollection* ) override;
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 47d6ae55f2cd..45842cd27441 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -41,7 +41,7 @@ namespace psp { struct JobData; class PrinterGfx; }
class FreetypeFontInstance;
class FontAttributes;
class SalInfoPrinter;
-class ImplFontMetricData;
+class FontMetricData;
class VCL_DLLPUBLIC GenPspGraphics final : public SalGraphicsAutoDelegateToImpl
{
@@ -78,7 +78,7 @@ public:
virtual void SetTextColor( Color nColor ) override;
virtual void SetFont(LogicalFontInstance*, int nFallbackLevel)
override;
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) override;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) override;
virtual FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities
&rFontCapabilities) const override;
virtual void GetDevFontList( vcl::font::PhysicalFontCollection*
) override;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index 9de7bd59fe6c..dcb3c2be9361 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -121,7 +121,7 @@ public:
FT_Face GetFtFace() const;
const FontConfigFontOptions* GetFontOptions() const;
- void GetFontMetric(ImplFontMetricDataRef const &) const;
+ void GetFontMetric(FontMetricDataRef const &) const;
bool GetGlyphBoundRect(sal_GlyphId, tools::Rectangle&,
bool) const;
bool GetGlyphOutline(sal_GlyphId,
basegfx::B2DPolyPolygon&, bool) const;
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 521461318da9..55cbb747193f 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -106,7 +106,7 @@ public:
virtual void SetTextColor( Color nColor ) override;
virtual void SetFont(LogicalFontInstance*, int
nFallbackLevel) override;
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) override;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) override;
virtual FontCharMapRef GetFontCharMap() const override;
virtual bool GetFontCapabilities(vcl::FontCapabilities
&rFontCapabilities) const override;
virtual void GetDevFontList(
vcl::font::PhysicalFontCollection* ) override;
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 3cf0b791460d..b58ae4b05866 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -53,7 +53,7 @@ class WinFontInstance;
class ImplFontAttrCache;
class SalGraphicsImpl;
class WinSalGraphicsImplBase;
-class ImplFontMetricData;
+class FontMetricData;
#define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000)
#define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff)
@@ -348,7 +348,7 @@ public:
// set the font
virtual void SetFont( LogicalFontInstance*, int nFallbackLevel
) override;
// get the current font's metrics
- virtual void GetFontMetric( ImplFontMetricDataRef&, int
nFallbackLevel ) override;
+ virtual void GetFontMetric( FontMetricDataRef&, int
nFallbackLevel ) override;
// get the repertoire of the current font
virtual FontCharMapRef GetFontCharMap() const override;
// get the layout capabilities of the current font
diff --git a/vcl/qt5/QtGraphics_Text.cxx b/vcl/qt5/QtGraphics_Text.cxx
index 18790086bbf3..325791802ed3 100644
--- a/vcl/qt5/QtGraphics_Text.cxx
+++ b/vcl/qt5/QtGraphics_Text.cxx
@@ -56,7 +56,7 @@ void QtGraphics::SetFont(LogicalFontInstance* pReqFont, int
nFallbackLevel)
m_pTextStyle[nFallbackLevel] = static_cast<QtFont*>(pReqFont);
}
-void QtGraphics::GetFontMetric(ImplFontMetricDataRef& rFMD, int nFallbackLevel)
+void QtGraphics::GetFontMetric(FontMetricDataRef& rFMD, int nFallbackLevel)
{
QRawFont aRawFont(QRawFont::fromFont(*m_pTextStyle[nFallbackLevel]));
QtFontFace::fillAttributesFromQFont(*m_pTextStyle[nFallbackLevel], *rFMD);
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 38112a7deb50..2d9b7c896781 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -76,12 +76,12 @@ CoreTextFont::~CoreTextFont()
CFRelease(mpCTFont);
}
-void CoreTextFont::GetFontMetric( ImplFontMetricDataRef const & rxFontMetric )
+void CoreTextFont::GetFontMetric( FontMetricDataRef const & rxFontMetric )
{
rxFontMetric->ImplCalcLineSpacing(this);
rxFontMetric->ImplInitBaselines(this);
- // since ImplFontMetricData::mnWidth is only used for stretching/squeezing
fonts
+ // since FontMetricData::mnWidth is only used for stretching/squeezing
fonts
// setting this width to the pixel height of the fontsize is good enough
// it also makes the calculation of the stretch factor simple
rxFontMetric->SetWidth( lrint( CTFontGetSize(mpCTFont) * mfFontStretch) );
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 522ccb2b3add..333f55113c2f 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -208,7 +208,7 @@ void AquaSalGraphics::SetTextColor( Color nColor )
maShared.maTextColor = nColor;
}
-void AquaSalGraphics::GetFontMetric(ImplFontMetricDataRef& rxFontMetric, int
nFallbackLevel)
+void AquaSalGraphics::GetFontMetric(FontMetricDataRef& rxFontMetric, int
nFallbackLevel)
{
if (nFallbackLevel < MAX_FALLBACK && mpFont[nFallbackLevel])
{
diff --git a/vcl/source/font/LogicalFontInstance.cxx
b/vcl/source/font/LogicalFontInstance.cxx
index ee9c01b3881f..d8a5bf378aae 100644
--- a/vcl/source/font/LogicalFontInstance.cxx
+++ b/vcl/source/font/LogicalFontInstance.cxx
@@ -28,7 +28,7 @@
LogicalFontInstance::LogicalFontInstance(const vcl::font::PhysicalFontFace&
rFontFace,
const vcl::font::FontSelectPattern&
rFontSelData)
- : mxFontMetric(new ImplFontMetricData(rFontSelData))
+ : mxFontMetric(new FontMetricData(rFontSelData))
, mpConversion(nullptr)
, mnLineHeight(0)
, mnOwnOrientation(0)
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 8a998c6815c6..0667dddf31ec 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -130,7 +130,7 @@ size_t FontMetric::GetHashValueIgnoreColor() const
return hash;
}
-ImplFontMetricData::ImplFontMetricData( const vcl::font::FontSelectPattern&
rFontSelData )
+FontMetricData::FontMetricData( const vcl::font::FontSelectPattern&
rFontSelData )
: FontAttributes( rFontSelData )
, mnHeight ( rFontSelData.mnHeight )
, mnWidth ( rFontSelData.mnWidth )
@@ -176,7 +176,7 @@ ImplFontMetricData::ImplFontMetricData( const
vcl::font::FontSelectPattern& rFon
SetStyleName( rFontSelData.GetStyleName() );
}
-bool ImplFontMetricData::ShouldNotUseUnderlineMetrics() const
+bool FontMetricData::ShouldNotUseUnderlineMetrics() const
{
if (utl::ConfigManager::IsFuzzing())
return false;
@@ -191,7 +191,7 @@ bool ImplFontMetricData::ShouldNotUseUnderlineMetrics()
const
return false;
}
-bool ImplFontMetricData::ImplInitTextLineSizeHarfBuzz(LogicalFontInstance*
pFont)
+bool FontMetricData::ImplInitTextLineSizeHarfBuzz(LogicalFontInstance* pFont)
{
if (ShouldNotUseUnderlineMetrics())
return false;
@@ -252,7 +252,7 @@ bool
ImplFontMetricData::ImplInitTextLineSizeHarfBuzz(LogicalFontInstance* pFont
return true;
}
-void ImplFontMetricData::ImplInitTextLineSize( const OutputDevice* pDev )
+void FontMetricData::ImplInitTextLineSize( const OutputDevice* pDev )
{
mnBulletOffset = ( pDev->GetTextWidth( OUString( u' ' ) ) -
pDev->GetTextWidth( OUString( u'\x00b7' ) ) ) >> 1 ;
@@ -345,7 +345,7 @@ void ImplFontMetricData::ImplInitTextLineSize( const
OutputDevice* pDev )
}
-void ImplFontMetricData::ImplInitAboveTextLineSize( const OutputDevice* pDev )
+void FontMetricData::ImplInitAboveTextLineSize( const OutputDevice* pDev )
{
ImplInitTextLineSize(pDev);
@@ -375,7 +375,7 @@ void ImplFontMetricData::ImplInitAboveTextLineSize( const
OutputDevice* pDev )
mnAboveWUnderlineOffset = nCeiling + (nIntLeading + 1) / 2;
}
-void ImplFontMetricData::ImplInitFlags( const OutputDevice* pDev )
+void FontMetricData::ImplInitFlags( const OutputDevice* pDev )
{
const vcl::Font& rFont ( pDev->GetFont() );
bool bCentered = true;
@@ -392,7 +392,7 @@ void ImplFontMetricData::ImplInitFlags( const OutputDevice*
pDev )
SetFullstopCenteredFlag( bCentered );
}
-bool ImplFontMetricData::ShouldUseWinMetrics(int nAscent, int nDescent, int
nTypoAscent,
+bool FontMetricData::ShouldUseWinMetrics(int nAscent, int nDescent, int
nTypoAscent,
int nTypoDescent, int nWinAscent,
int nWinDescent) const
{
@@ -425,7 +425,7 @@ constexpr auto ASCENT_HHEA =
static_cast<hb_ot_metrics_tag_t>(HB_TAG('H', 'a', '
constexpr auto DESCENT_HHEA = static_cast<hb_ot_metrics_tag_t>(HB_TAG('H',
'd', 's', 'c'));
constexpr auto LINEGAP_HHEA = static_cast<hb_ot_metrics_tag_t>(HB_TAG('H',
'l', 'g', 'p'));
-void ImplFontMetricData::ImplCalcLineSpacing(LogicalFontInstance*
pFontInstance)
+void FontMetricData::ImplCalcLineSpacing(LogicalFontInstance* pFontInstance)
{
mnAscent = mnDescent = mnExtLeading = mnIntLeading = 0;
auto* pFace = pFontInstance->GetFontFace();
@@ -538,7 +538,7 @@ void
ImplFontMetricData::ImplCalcLineSpacing(LogicalFontInstance* pFontInstance)
mnIntLeading = mnAscent + mnDescent - mnHeight;
}
-void ImplFontMetricData::ImplInitBaselines(LogicalFontInstance *pFontInstance)
+void FontMetricData::ImplInitBaselines(LogicalFontInstance *pFontInstance)
{
hb_font_t* pHbFont = pFontInstance->GetHbFont();
double fScale = 0;
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 3bfbb8f6d8ce..6525368964af 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -178,7 +178,7 @@ FontMetric OutputDevice::GetFontMetric() const
return aMetric;
LogicalFontInstance* pFontInstance = mpFontInstance.get();
- ImplFontMetricDataRef xFontMetric = pFontInstance->mxFontMetric;
+ FontMetricDataRef xFontMetric = pFontInstance->mxFontMetric;
// prepare metric
aMetric = maFont;
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 1664182e8aed..57af5949bfe1 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1193,7 +1193,7 @@ void
PrintFontManager::Substitute(vcl::font::FontSelectPattern &rPattern, OUStri
{
// Some fonts exist in "more_fonts", but have no U+00B7 MIDDLE DOT
// so will always glyph fallback on measuring mnBulletOffset in
- // ImplFontMetricData::ImplInitTextLineSize
+ // FontMetricData::ImplInitTextLineSize
return;
}
if (rPattern.maTargetName == "Linux Libertine G" &&
rPattern.maSearchName == "Linux Libertine O")
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index ab7ceaf8c7e7..19887a9af230 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -71,7 +71,7 @@ void X11SalGraphics::GetDevFontList(
vcl::font::PhysicalFontCollection* pFontCol
}
void
-X11SalGraphics::GetFontMetric( ImplFontMetricDataRef &rxFontMetric, int
nFallbackLevel )
+X11SalGraphics::GetFontMetric( FontMetricDataRef &rxFontMetric, int
nFallbackLevel )
{
mxTextRenderImpl->GetFontMetric(rxFontMetric, nFallbackLevel);
}
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx
b/vcl/unx/generic/gdi/freetypetextrender.cxx
index dcf53bc40083..75fa18146dd7 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -110,7 +110,7 @@ void FreeTypeTextRenderImpl::GetDevFontList(
vcl::font::PhysicalFontCollection*
GenPspGraphics::GetDevFontListHelper(pFontCollection);
}
-void FreeTypeTextRenderImpl::GetFontMetric( ImplFontMetricDataRef&
rxFontMetric, int nFallbackLevel )
+void FreeTypeTextRenderImpl::GetFontMetric( FontMetricDataRef& rxFontMetric,
int nFallbackLevel )
{
if( nFallbackLevel >= MAX_FALLBACK )
return;
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index af9f656b17d5..bc73ed0168a9 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -491,7 +491,7 @@ FreetypeFont::~FreetypeFont()
mxFontInfo->ReleaseFaceFT();
}
-void FreetypeFont::GetFontMetric(ImplFontMetricDataRef const & rxTo) const
+void FreetypeFont::GetFontMetric(FontMetricDataRef const & rxTo) const
{
rxTo->FontAttributes::operator =(mxFontInfo->GetFontAttributes());
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx
b/vcl/unx/generic/print/genpspgraphics.cxx
index 54496bff8d6c..6cf66ac49aa3 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -282,7 +282,7 @@ void GenPspGraphics::ClearDevFontCache()
FreetypeManager::get().ClearFontCache();
}
-void GenPspGraphics::GetFontMetric(ImplFontMetricDataRef& rxFontMetric, int
nFallbackLevel)
+void GenPspGraphics::GetFontMetric(FontMetricDataRef& rxFontMetric, int
nFallbackLevel)
{
if (nFallbackLevel >= MAX_FALLBACK)
return;
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 196932982c28..37afd63123b8 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -834,7 +834,7 @@ void WinSalGraphics::SetFont(LogicalFontInstance* pFont,
int nFallbackLevel)
}
}
-void WinSalGraphics::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int
nFallbackLevel )
+void WinSalGraphics::GetFontMetric( FontMetricDataRef& rxFontMetric, int
nFallbackLevel )
{
// temporarily change the HDC to the font in the fallback level
rtl::Reference<WinFontInstance> pFontInstance =
mpWinFontEntry[nFallbackLevel];
