[Libreoffice-commits] core.git: include/vcl vcl/headless vcl/inc vcl/qt5 vcl/source vcl/unx
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sun May 24 18:26:19 UTC 2020
include/vcl/outdev.hxx | 10 ----------
include/vcl/sysdata.hxx | 29 -----------------------------
vcl/headless/svptext.cxx | 10 ----------
vcl/inc/headless/svpgdi.hxx | 1 -
vcl/inc/qt5/Qt5Graphics.hxx | 1 -
vcl/inc/salgdi.hxx | 6 ------
vcl/inc/textrender.hxx | 5 -----
vcl/inc/unx/freetypetextrender.hxx | 3 ---
vcl/inc/unx/genpspgraphics.h | 2 --
vcl/inc/unx/salgdi.h | 1 -
vcl/qt5/Qt5Graphics.cxx | 5 -----
vcl/source/outdev/font.cxx | 17 -----------------
vcl/unx/generic/gdi/font.cxx | 9 ---------
vcl/unx/generic/gdi/freetypetextrender.cxx | 23 -----------------------
vcl/unx/generic/print/genpspgraphics.cxx | 5 -----
15 files changed, 127 deletions(-)
New commits:
commit b55838c8ce067898f479569e62b7b11e137885ab
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat May 23 21:13:20 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun May 24 20:25:39 2020 +0200
GetSysFontData is newly unused
and thus SystemFontData
Change-Id: I563a6b7c251194cd73c6b0026d4ae8485a057b28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94740
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index e9231c30fb8a..6813eccd51ee 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -55,7 +55,6 @@
struct ImplOutDevData;
class LogicalFontInstance;
struct SystemGraphicsData;
-struct SystemFontData;
class ImplFontCache;
class PhysicalFontCollection;
class ImplDeviceFontList;
@@ -1232,15 +1231,6 @@ public:
bool GetFontFeatures(std::vector<vcl::font::Feature>& rFontFeatures) const;
-
- /** Retrieve detailed font information in platform independent structure
-
- @param nFallbacklevel Fallback font level (0 = best matching font)
-
- @return SystemFontData
- */
- SystemFontData GetSysFontData( int nFallbacklevel ) const;
-
SAL_DLLPRIVATE void ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine, tools::Rectangle& rRect1, tools::Rectangle& rRect2,
long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight );
SAL_DLLPRIVATE static FontEmphasisMark
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 8be99112d74b..1be73fef8856 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -185,35 +185,6 @@ struct SystemWindowData
#endif
};
-#if ENABLE_CAIRO_CANVAS
-
-struct SystemFontData
-{
-#if defined( UNX )
- void* nFontId; // native font id
- int nFontFlags; // native font flags
-#endif
- bool bFakeBold; // Does this font need faking the bold style
- bool bFakeItalic; // Does this font need faking the italic style
- bool bAntialias; // Should this font be antialiased
- bool bVerticalCharacterType; // Is the font using vertical character type
-
- SystemFontData()
- :
-#if defined( UNX )
- nFontId( nullptr ),
- nFontFlags( 0 ),
-#endif
- bFakeBold( false ),
- bFakeItalic( false ),
- bAntialias( true ),
- bVerticalCharacterType( false )
- {
- }
-};
-
-#endif // ENABLE_CAIRO_CANVAS
-
#endif // INCLUDED_VCL_SYSDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index e4b625b365cb..f44373f5acc1 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -22,7 +22,6 @@
#include <vcl/fontcharmap.hxx>
#include <basegfx/range/b2ibox.hxx>
#include <headless/svpgdi.hxx>
-#include <config_cairo_canvas.h>
#include <impfontmetricdata.hxx>
#include <sallayout.hxx>
@@ -109,13 +108,4 @@ void SvpSalGraphics::SetTextColor( Color nColor )
m_aTextRenderImpl.SetTextColor(nColor);
}
-#if ENABLE_CAIRO_CANVAS
-
-SystemFontData SvpSalGraphics::GetSysFontData( int nFallbacklevel ) const
-{
- return m_aTextRenderImpl.GetSysFontData(nFallbacklevel);
-}
-
-#endif // ENABLE_CAIRO_CANVAS
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 3d1617d07100..3cffdcd2a1c0 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -273,7 +273,6 @@ public:
virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
- virtual SystemFontData GetSysFontData( int nFallbacklevel ) const override;
#endif // ENABLE_CAIRO_CANVAS
cairo_t* getCairoContext(bool bXorModeAllowed) const;
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx
index bc4870ee7e18..1515783f6076 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/Qt5Graphics.hxx
@@ -92,7 +92,6 @@ public:
const Size& rSize) const override;
virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface,
const basegfx::B2ISize& rSize) const override;
- virtual SystemFontData GetSysFontData(int nFallbacklevel) const override;
#endif // ENABLE_CAIRO_CANVAS
// GDI
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 2161ebeb6358..76f367544203 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -48,10 +48,6 @@ class OutputDevice;
class FreetypeFont;
struct SystemGraphicsData;
-#if ENABLE_CAIRO_CANVAS
-struct SystemFontData;
-#endif // ENABLE_CAIRO_CANVAS
-
namespace basegfx {
class B2DVector;
class B2DPolygon;
@@ -436,8 +432,6 @@ public:
virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const = 0;
virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const = 0;
- virtual SystemFontData GetSysFontData( int nFallbacklevel ) const = 0;
-
#endif // ENABLE_CAIRO_CANVAS
protected:
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index 1aec8fba2301..f1cbfd8990b5 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -22,8 +22,6 @@
#include "salgdi.hxx"
-#include <config_cairo_canvas.h>
-
class ImplLayoutArgs;
class ImplFontMetricData;
class PhysicalFontCollection;
@@ -64,9 +62,6 @@ public:
virtual std::unique_ptr<GenericSalLayout>
GetTextLayout(int nFallbackLevel) = 0;
virtual void DrawTextLayout(const GenericSalLayout&, const SalGraphics&) = 0;
-#if ENABLE_CAIRO_CANVAS
- virtual SystemFontData GetSysFontData( int nFallbackLevel ) const = 0;
-#endif // ENABLE_CAIRO_CANVAS
};
#endif
diff --git a/vcl/inc/unx/freetypetextrender.hxx b/vcl/inc/unx/freetypetextrender.hxx
index ccc1db0157d2..9c4960e0f36c 100644
--- a/vcl/inc/unx/freetypetextrender.hxx
+++ b/vcl/inc/unx/freetypetextrender.hxx
@@ -65,9 +65,6 @@ public:
virtual std::unique_ptr<GenericSalLayout>
GetTextLayout(int nFallbackLevel) override;
-#if ENABLE_CAIRO_CANVAS
- virtual SystemFontData GetSysFontData( int nFallbackLevel ) const override;
-#endif
};
#endif
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index b696618c75ca..c02d6aa21fe3 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -203,8 +203,6 @@ public:
virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
-
- virtual SystemFontData GetSysFontData( int nFallbacklevel ) const override;
#endif // ENABLE_CAIRO_CANVAS
};
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 4216b703c14e..caef46a1a2e8 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -264,7 +264,6 @@ public:
virtual cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width, int height) const override;
virtual cairo::SurfaceSharedPtr CreateBitmapSurface(const OutputDevice& rRefDevice, const BitmapSystemData& rData, const Size& rSize) const override;
virtual css::uno::Any GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& rSurface, const basegfx::B2ISize& rSize) const override;
- virtual SystemFontData GetSysFontData( int nFallbackLevel ) const override;
void clipRegion(cairo_t* cr);
#endif // ENABLE_CAIRO_CANVAS
diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/Qt5Graphics.cxx
index 34f610812d45..257e0f436334 100644
--- a/vcl/qt5/Qt5Graphics.cxx
+++ b/vcl/qt5/Qt5Graphics.cxx
@@ -104,11 +104,6 @@ css::uno::Any Qt5Graphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& /*rSu
return css::uno::Any();
}
-SystemFontData Qt5Graphics::GetSysFontData(int /*nFallbacklevel*/) const
-{
- return SystemFontData();
-}
-
#endif
void Qt5Graphics::handleDamage(const tools::Rectangle& rDamagedRegion)
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 59ce4ef52a99..b7d8bfeeba7c 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -278,23 +278,6 @@ bool OutputDevice::GetFontCapabilities( vcl::FontCapabilities& rFontCapabilities
return mpGraphics->GetFontCapabilities(rFontCapabilities);
}
-#if ENABLE_CAIRO_CANVAS
-
-SystemFontData OutputDevice::GetSysFontData(int nFallbacklevel) const
-{
- SystemFontData aSysFontData;
-
- if (!mpGraphics)
- (void) AcquireGraphics();
-
- if (mpGraphics)
- aSysFontData = mpGraphics->GetSysFontData(nFallbacklevel);
-
- return aSysFontData;
-}
-
-#endif // ENABLE_CAIRO_CANVAS
-
void OutputDevice::ImplGetEmphasisMark( tools::PolyPolygon& rPolyPoly, bool& rPolyLine,
tools::Rectangle& rRect1, tools::Rectangle& rRect2,
long& rYOff, long& rWidth,
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index ede4d953c48e..5a6f04fd856f 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -80,15 +80,6 @@ std::unique_ptr<GenericSalLayout> X11SalGraphics::GetTextLayout(int nFallbackLev
return mxTextRenderImpl->GetTextLayout(nFallbackLevel);
}
-#if ENABLE_CAIRO_CANVAS
-
-SystemFontData X11SalGraphics::GetSysFontData( int nFallbackLevel ) const
-{
- return mxTextRenderImpl->GetSysFontData(nFallbackLevel);
-}
-
-#endif
-
bool X11SalGraphics::CreateFontSubset(
const OUString& rToFile,
const PhysicalFontFace* pFont,
diff --git a/vcl/unx/generic/gdi/freetypetextrender.cxx b/vcl/unx/generic/gdi/freetypetextrender.cxx
index 3d94da30440a..b364406f1e1d 100644
--- a/vcl/unx/generic/gdi/freetypetextrender.cxx
+++ b/vcl/unx/generic/gdi/freetypetextrender.cxx
@@ -153,29 +153,6 @@ std::unique_ptr<GenericSalLayout> FreeTypeTextRenderImpl::GetTextLayout(int nFal
return std::make_unique<GenericSalLayout>(*mpFreetypeFont[nFallbackLevel]);
}
-#if ENABLE_CAIRO_CANVAS
-SystemFontData FreeTypeTextRenderImpl::GetSysFontData( int nFallbackLevel ) const
-{
- SystemFontData aSysFontData;
-
- if (nFallbackLevel >= MAX_FALLBACK) nFallbackLevel = MAX_FALLBACK - 1;
- if (nFallbackLevel < 0 ) nFallbackLevel = 0;
-
- if (mpFreetypeFont[nFallbackLevel])
- {
- FreetypeFont& rFreetypeFont = mpFreetypeFont[nFallbackLevel]->GetFreetypeFont();
- aSysFontData.nFontId = rFreetypeFont.GetFtFace();
- aSysFontData.nFontFlags = rFreetypeFont.GetLoadFlags();
- aSysFontData.bFakeBold = rFreetypeFont.NeedsArtificialBold();
- aSysFontData.bFakeItalic = rFreetypeFont.NeedsArtificialItalic();
- aSysFontData.bAntialias = rFreetypeFont.GetAntialiasAdvice();
- aSysFontData.bVerticalCharacterType = mpFreetypeFont[nFallbackLevel]->GetFontSelectPattern().mbVertical;
- }
-
- return aSysFontData;
-}
-#endif
-
bool FreeTypeTextRenderImpl::CreateFontSubset(
const OUString& rToFile,
const PhysicalFontFace* pFont,
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index 235f45eb83a4..03319d1acf53 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -944,11 +944,6 @@ css::uno::Any GenPspGraphics::GetNativeSurfaceHandle(cairo::SurfaceSharedPtr& /*
return css::uno::Any();
}
-SystemFontData GenPspGraphics::GetSysFontData( int /* nFallbacklevel */ ) const
-{
- return SystemFontData();
-}
-
#endif // ENABLE_CAIRO_CANVAS
bool GenPspGraphics::supportsOperation( OutDevSupportType ) const
More information about the Libreoffice-commits
mailing list