summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/aqua/atsui/salgdi.h3
-rw-r--r--vcl/inc/coretext/salgdi2.h3
-rw-r--r--vcl/inc/generic/genpspgraphics.h1
-rw-r--r--vcl/inc/headless/svpgdi.hxx1
-rw-r--r--vcl/inc/outdev.h9
-rw-r--r--vcl/inc/outfont.hxx3
-rw-r--r--vcl/inc/salgdi.hxx4
-rw-r--r--vcl/inc/unx/salgdi.h1
-rw-r--r--vcl/inc/win/salgdi.h3
9 files changed, 4 insertions, 24 deletions
diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index b543fe15541f..acf3b097bea2 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -268,9 +268,6 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
// graphics must drop any cached font info
virtual void ClearDevFontCache();
- // graphics should call ImplAddDevFontSubstitute on supplied
- // OutputDevice for all its device specific preferred font substitutions
- virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h
index 214d12fdca3f..ae18647632d6 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi2.h
@@ -332,9 +332,6 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
// graphics must drop any cached font info
virtual void ClearDevFontCache();
- // graphics should call ImplAddDevFontSubstitute on supplied
- // OutputDevice for all its device specific preferred font substitutions
- virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h
index 74ccf65137ee..17912bcc023e 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/generic/genpspgraphics.h
@@ -95,7 +95,6 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
// graphics must drop any cached font info
virtual void ClearDevFontCache();
- virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
virtual sal_Bool CreateFontSubset( const OUString& rToFile,
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 2853c89bf2af..3ffca01fc6ec 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -136,7 +136,6 @@ public:
virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
virtual void ClearDevFontCache();
- virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 226a83d8688f..2d145fecdab0 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -211,14 +211,12 @@ private:
FontInstanceList maFontInstanceList;
public:
- ImplFontCache( bool bPrinter );
+ ImplFontCache();
~ImplFontCache();
ImplFontEntry* GetFontEntry( ImplDevFontList*,
- const Font&, const Size& rPixelSize, float fExactHeight,
- ImplDirectFontSubstitution* pDevSpecific );
- ImplFontEntry* GetFontEntry( ImplDevFontList*,
- FontSelectPattern&, ImplDirectFontSubstitution* pDevSpecific );
+ const Font&, const Size& rPixelSize, float fExactHeight);
+ ImplFontEntry* GetFontEntry( ImplDevFontList*, FontSelectPattern& );
ImplFontEntry* GetGlyphFallbackFont( ImplDevFontList*, FontSelectPattern&,
int nFallbackLevel, OUString& rMissingCodes );
void Release( ImplFontEntry* );
@@ -238,7 +236,6 @@ struct ImplOutDevData
VirtualDevice* mpRotateDev;
vcl::ControlLayoutData* mpRecordLayout;
Rectangle maRecordRect;
- ImplDirectFontSubstitution maDevFontSubst;
// #i75163#
basegfx::B2DHomMatrix* mpViewTransform;
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx
index eb3c48023b38..4e1af96bfde1 100644
--- a/vcl/inc/outfont.hxx
+++ b/vcl/inc/outfont.hxx
@@ -34,7 +34,6 @@ class ImplDevFontListData;
class ImplGetDevFontList;
class ImplGetDevSizeList;
class ImplFontEntry;
-class ImplDirectFontSubstitution;
class ImplPreMatchFontSubstitution;
class ImplGlyphFallbackFontSubstitution;
class FontSelectPattern;
@@ -233,7 +232,7 @@ public:
// find the device font
ImplDevFontListData* FindFontFamily( const OUString& rFontName ) const;
- ImplDevFontListData* ImplFindByFont( FontSelectPattern&, bool bPrinter, ImplDirectFontSubstitution* ) const;
+ ImplDevFontListData* ImplFindByFont( FontSelectPattern& ) const;
ImplDevFontListData* ImplFindBySearchName( const OUString& ) const;
// suggest fonts for glyph fallback
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 323c66add610..abb57bd3ca02 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -245,10 +245,6 @@ public:
// graphics must drop any cached font info
virtual void ClearDevFontCache() = 0;
- // graphics should call ImplAddDevFontSubstitute on supplied
- // OutputDevice for all its device specific preferred font substitutions
- virtual void GetDevFontSubstList( OutputDevice* ) = 0;
-
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName ) = 0;
// CreateFontSubset: a method to get a subset of glyhps of a font
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index acb3d7ecaa24..68ca728ca2e1 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -232,7 +232,6 @@ public:
virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
virtual void GetDevFontList( ImplDevFontList* );
virtual void ClearDevFontCache();
- virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
virtual sal_Bool CreateFontSubset( const OUString& rToFile,
const PhysicalFontFace*,
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 6e96c7023082..24412526710f 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -314,9 +314,6 @@ public:
virtual void GetDevFontList( ImplDevFontList* );
// graphics must drop any cached font info
virtual void ClearDevFontCache();
- // graphics should call ImplAddDevFontSubstitute on supplied
- // OutputDevice for all its device specific preferred font substitutions
- virtual void GetDevFontSubstList( OutputDevice* );
virtual bool AddTempDevFont( ImplDevFontList*, const OUString& rFileURL, const OUString& rFontName );
// CreateFontSubset: a method to get a subset of glyhps of a font
// inside a new valid font file