diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-11-29 08:34:29 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-06 20:41:37 -0500 |
| commit | 40b1cadc63523a3b3269838748f47d5ac251877e (patch) | |
| tree | 6e3b898a75f6af5c9e43e67c49c98e71969739a6 /include | |
| parent | 4017309721bd3e0439246c3d63afec809d40b81a (diff) | |
Drop a bunch of font metrics flags
These flags mean nothing these days, there are either always true or
always false, since we no longer support bitmap or Type 1 fonts.
Change-Id: Ie14ca480225a6346d868a44e58e7666c3a06931d
Reviewed-on: https://gerrit.libreoffice.org/31346
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 74314b11a4b5a2887bd1ff19bdcfb3572b09240c)
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ctrltool.hxx | 6 | ||||
| -rw-r--r-- | include/tools/fontenum.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/font.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/metric.hxx | 6 |
4 files changed, 2 insertions, 23 deletions
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 7e2ec66fae84..48196a0169ea 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -152,13 +152,11 @@ private: SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const OUString& rSearchName, sal_uLong* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const OUString& rStr ) const; - SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, bool bAll, - bool bInsertData ); + SVT_DLLPRIVATE void ImplInsertFonts(OutputDevice* pDev, bool bInsertData); public: FontList( OutputDevice* pDevice, - OutputDevice* pDevice2 = nullptr, - bool bAll = true ); + OutputDevice* pDevice2 = nullptr); ~FontList(); FontList* Clone() const; diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx index ce5736b192d1..eeb35be1985c 100644 --- a/include/tools/fontenum.hxx +++ b/include/tools/fontenum.hxx @@ -75,9 +75,6 @@ namespace o3tl } -enum FontType { TYPE_DONTKNOW, TYPE_RASTER, TYPE_VECTOR, TYPE_SCALABLE, - FontType_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; - enum FontEmbeddedBitmap { EMBEDDEDBITMAP_DONTKNOW, EMBEDDEDBITMAP_FALSE, EMBEDDEDBITMAP_TRUE }; enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE }; diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 9e0a637c85c1..2dc0a5b326cd 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -87,21 +87,11 @@ public: // Device dependent functions int GetQuality() const; - bool IsBuiltInFont() const; - bool CanEmbed() const; - bool CanSubset() const; - bool CanRotate() const; - void SetQuality(int); void IncreaseQualityBy(int); void DecreaseQualityBy(int); void SetMapNames(OUString const &); - void SetBuiltInFontFlag(bool); - void SetEmbeddableFlag(bool); - void SetSubsettableFlag(bool); - void SetOrientationFlag(bool); - // 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; diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index 22c28496f58d..3709364a0b5c 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -38,8 +38,6 @@ public: FontMetric( const FontMetric& ); // TODO make this explicit virtual ~FontMetric() override; - FontType GetType() const; - long GetAscent() const; long GetDescent() const; long GetInternalLeading() const; @@ -56,13 +54,9 @@ public: void SetSlant(long); void SetBulletOffset(long); - bool IsScalable() const; bool IsFullstopCentered() const; - bool IsBuiltInFont() const; - void SetScalableFlag(bool); void SetFullstopCenteredFlag(bool); - void SetBuiltInFontFlag(bool); FontMetric& operator=( const FontMetric& rMetric ); FontMetric& operator=( FontMetric&& rMetric ); |