diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-03-07 11:19:29 +1100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-08-28 14:10:51 +0200 |
| commit | 9a58ec3f6f65da27e3b26e1173b6661b743e66a4 (patch) | |
| tree | aa784b6583865a629f3786603b4803992b1d5408 /include/vcl | |
| parent | bd555ee0ebc94bfffa41ac5d5eede580f330a7f7 (diff) | |
tdf#74702 vcl: remove GetOutDevType() from ImplNewFont()
Change-Id: I59a14b0c392098761f9304708f4859f7e2381c14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115469
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 011fc5445e0c..144a52308a3e 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -177,8 +177,6 @@ private: mutable VclPtr<OutputDevice> mpNextGraphics; ///< Next output device in list GDIMetaFile* mpMetaFile; mutable rtl::Reference<LogicalFontInstance> mpFontInstance; - mutable std::shared_ptr<ImplFontCache> mxFontCache; - mutable std::shared_ptr<PhysicalFontCollection> mxFontCollection; mutable std::unique_ptr<ImplDeviceFontList> mpDeviceFontList; mutable std::unique_ptr<ImplDeviceFontSizeList> mpDeviceFontSizeList; std::vector<OutDevState> maOutDevStateStack; @@ -253,6 +251,10 @@ private: mutable bool mbRefPoint : 1; mutable bool mbEnableRTL : 1; +protected: + mutable std::shared_ptr<PhysicalFontCollection> mxFontCollection; + mutable std::shared_ptr<ImplFontCache> mxFontCache; + /** @name Initialization and accessor functions */ ///@{ @@ -1178,12 +1180,12 @@ protected: void SetFontCollectionFromSVData(); void ResetNewFontCache(); + SAL_DLLPRIVATE bool ImplNewFont() const; + private: typedef void ( OutputDevice::* FontUpdateHandler_t )( bool ); - SAL_DLLPRIVATE bool ImplNewFont() const; - SAL_DLLPRIVATE static void ImplUpdateFontDataForAllFrames( FontUpdateHandler_t pHdl, bool bNewFontLists ); static |