diff options
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/PhysicalFontCollection.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/outdev.h | 13 | ||||
| -rw-r--r-- | vcl/source/gdi/print.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/virdev.cxx | 1 | ||||
| -rw-r--r-- | vcl/source/outdev/font.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/outdev.cxx | 2 |
7 files changed, 0 insertions, 25 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index eb74ae2f248e..f44a9d5e3b70 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -70,7 +70,6 @@ class LogicalFontInstance; struct SystemGraphicsData; class ImplFontCache; class PhysicalFontCollection; -class ImplDeviceFontSizeList; class ImplMultiTextLineInfo; class SalGraphics; class Gradient; @@ -184,7 +183,6 @@ private: GDIMetaFile* mpMetaFile; mutable rtl::Reference<LogicalFontInstance> mpFontInstance; mutable std::unique_ptr<vcl::font::PhysicalFontFaceCollection> mpFontFaceCollection; - mutable std::unique_ptr<ImplDeviceFontSizeList> mpDeviceFontSizeList; std::vector<vcl::State> maOutDevStateStack; std::unique_ptr<ImplOutDevData> mpOutDevData; std::vector< VCLXGraphics* >* mpUnoGraphicsList; diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx index ee1fdad285c9..b35d3d1c6f99 100644 --- a/vcl/inc/PhysicalFontCollection.hxx +++ b/vcl/inc/PhysicalFontCollection.hxx @@ -29,7 +29,6 @@ #define MAX_GLYPHFALLBACK 16 -class ImplDeviceFontSizeList; class ImplGlyphFallbackFontSubstitution; class ImplPreMatchFontSubstitution; diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h index c9185bcc23fb..c6cf81369ee2 100644 --- a/vcl/inc/outdev.h +++ b/vcl/inc/outdev.h @@ -36,19 +36,6 @@ class VirtualDevice; class PhysicalFontCollection; enum class AddFontSubstituteFlags; -class ImplDeviceFontSizeList -{ -private: - std::vector<int> maSizeList; - -public: - ImplDeviceFontSizeList() - { maSizeList.reserve( 32 ); } - void Add( int nHeight ) { maSizeList.push_back( nHeight ); } - int Count() const { return maSizeList.size(); } - int Get( int nIndex ) const { return maSizeList[ nIndex ]; } -}; - // nowadays these substitutions are needed for backward compatibility and tight platform integration: // - substitutions from configuration entries (Tools->Options->FontReplacement and/or fontconfig) // - device specific substitutions (e.g. for PS printer builtin fonts) diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index a4d020008f30..981dd6ec76b6 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -556,7 +556,6 @@ void Printer::ImplReleaseFonts() mpFontInstance.clear(); mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); } void Printer::ImplReleaseGraphics(bool bRelease) @@ -923,7 +922,6 @@ void Printer::dispose() // TODO: consolidate duplicate cleanup by Printer and OutputDevice mpFontInstance.clear(); mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); mxFontCache.reset(); // font list deleted by OutputDevice dtor } @@ -1070,7 +1068,6 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) pSVData->mpDefInst->DestroyInfoPrinter( mpInfoPrinter ); mpFontInstance.clear(); mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); // clean up font list mxFontCache.reset(); mxFontCollection.reset(); @@ -1099,7 +1096,6 @@ bool Printer::SetPrinterProps( const Printer* pPrinter ) mpFontInstance.clear(); mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); mxFontCache.reset(); mxFontCollection.reset(); mbInitFont = true; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index fb4f52625c09..9a40f04e2725 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -472,7 +472,6 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32 // => clean up the original font lists before getting new ones mpFontInstance.clear(); mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); // preserve global font lists ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index ce10f5520e28..4587974bef76 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -460,7 +460,6 @@ void OutputDevice::ImplClearFontData( const bool bNewFontLists ) if ( bNewFontLists ) { mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); // release all physically selected fonts on this device if( AcquireGraphics() ) @@ -1435,7 +1434,6 @@ void OutputDevice::ImplReleaseFonts() mpFontInstance.clear(); mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index cc734924540e..7cb123bea790 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -70,7 +70,6 @@ OutputDevice::OutputDevice(OutDevType eOutDevType) : mpMetaFile = nullptr; mpFontInstance = nullptr; mpFontFaceCollection = nullptr; - mpDeviceFontSizeList = nullptr; mpAlphaVDev = nullptr; mpExtOutDevData = nullptr; mnOutOffX = 0; @@ -171,7 +170,6 @@ void OutputDevice::dispose() // remove cached results of GetDevFontList/GetDevSizeList mpFontFaceCollection.reset(); - mpDeviceFontSizeList.reset(); // release ImplFontCache specific to this OutputDevice mxFontCache.reset(); |