diff options
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/fontselect.hxx | 18 | ||||
| -rw-r--r-- | vcl/source/font/fontselect.cxx | 19 |
3 files changed, 1 insertions, 38 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 54c22e6cc7fd..7f5d55d15641 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -87,7 +87,7 @@ class VirtualDevice; struct SalTwoRect; class VirtualDevice; class Printer; -class FontSelectPattern; +class FontSelectPatternAttributes; class VCLXGraphics; class OutDevStateStack; struct BitmapSystemData; diff --git a/vcl/inc/fontselect.hxx b/vcl/inc/fontselect.hxx index fd453a0d5f54..0350412366fe 100644 --- a/vcl/inc/fontselect.hxx +++ b/vcl/inc/fontselect.hxx @@ -68,24 +68,6 @@ public: ItalicMatrix maItalicMatrix; // Force matrix for slant }; - -class FontSelectPattern : public FontSelectPatternAttributes -{ -public: - FontSelectPattern( const vcl::Font&, const OUString& rSearchName, - const Size&, float fExactHeight ); -#ifdef _WIN32 -// ifdeffed to prevent it going into unusedcode.easy - FontSelectPattern( const PhysicalFontFace&, const Size&, - float fExactHeight, int nOrientation, bool bVertical ); -#endif - -public: // TODO: change to private - rtl::Reference<LogicalFontInstance> mpFontInstance; // pointer to the resulting FontCache entry - - void copyAttributes(const FontSelectPatternAttributes &rAttributes); -}; - #endif // INCLUDED_VCL_INC_FONTSELECT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/font/fontselect.cxx b/vcl/source/font/fontselect.cxx index 563c6ebcbc54..ebad5b035944 100644 --- a/vcl/source/font/fontselect.cxx +++ b/vcl/source/font/fontselect.cxx @@ -30,14 +30,6 @@ const char FontSelectPatternAttributes::FEAT_PREFIX = ':'; const char FontSelectPatternAttributes::FEAT_SEPARATOR = '&'; -FontSelectPattern::FontSelectPattern( const vcl::Font& rFont, - const OUString& rSearchName, const Size& rSize, float fExactHeight) - : FontSelectPatternAttributes(rFont, rSearchName, rSize, fExactHeight) - , mpFontInstance( nullptr ) -{ -} - - FontSelectPatternAttributes::FontSelectPatternAttributes( const vcl::Font& rFont, const OUString& rSearchName, const Size& rSize, float fExactHeight ) : maSearchName( rSearchName ) @@ -89,19 +81,8 @@ FontSelectPatternAttributes::FontSelectPatternAttributes( const PhysicalFontFace // NOTE: no normalization for width/height/orientation } -FontSelectPattern::FontSelectPattern( const PhysicalFontFace& rFontData, - const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) - : FontSelectPatternAttributes(rFontData, rSize, fExactHeight, nOrientation, bVertical) - , mpFontInstance( nullptr ) -{ -} #endif -void FontSelectPattern::copyAttributes(const FontSelectPatternAttributes &rAttributes) -{ - static_cast<FontSelectPatternAttributes&>(*this) = rAttributes; -} - size_t FontSelectPatternAttributes::hashCode() const { // TODO: does it pay off to improve this hash function? |