[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source

[Libreoffice Gerrit user]

 include/vcl/outdev.hxx         |    2 +-
 vcl/inc/fontselect.hxx         |   18 ------------------
 vcl/source/font/fontselect.cxx |   19 -------------------
 3 files changed, 1 insertion(+), 38 deletions(-)

New commits:
commit 450b89b61d3a061174194acb1c18cb859cfc0123
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 21 09:35:08 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 22 00:24:35 2018 +0200

    drop now unused FontSelectPattern
    
    Change-Id: Ie236f1dd88f21cf85130ab324787d7b9bd2ff81e
    Reviewed-on: https://gerrit.libreoffice.org/59389
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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?