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

[Chris Sherlock (via logerrit)]

 include/vcl/outdev.hxx         |    2 +-
 vcl/inc/pdf/pdfwriter_impl.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2284be4f80664c54fa2ef8652030aa14d63c13a2
Author:     Chris Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Tue Sep 7 04:46:19 2021 +1000
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Sep 7 08:54:03 2021 +0200

    vcl: followup tdf#74702 vcl: remove GetOutDevType() from ImplNewFont()
    
    virtual keyword was missing on ImplNewFont(), without it the previous
    change effectively removed the PDFWriterImpl code. Thanks to Noel for
    pointing this out.
    
    Change-Id: I3148ee90e61cdb9d2d6b242ebe4964fb0394416d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121734
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 23b70e5599c7..2995769bd060 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1191,7 +1191,7 @@ protected:
     void SetFontCollectionFromSVData();
     void ResetNewFontCache();
 
-    SAL_DLLPRIVATE bool         ImplNewFont() const;
+    virtual bool ImplNewFont() const;
 
 private:
 
diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx
index c345fbf23d42..d8dc69d07a13 100644
--- a/vcl/inc/pdf/pdfwriter_impl.hxx
+++ b/vcl/inc/pdf/pdfwriter_impl.hxx
@@ -643,7 +643,7 @@ public:
     static void convertLineInfoToExtLineInfo( const LineInfo& rIn, 
PDFWriter::ExtLineInfo& rOut );
 
 protected:
-    bool ImplNewFont() const;
+    bool ImplNewFont() const override;
     void ImplClearFontData(bool bNewFontLists) override;
     void ImplRefreshFontData(bool bNewFontLists) override;
     vcl::Region ClipToDeviceBounds(vcl::Region aRegion) const override;