diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-28 15:16:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-28 20:40:45 +0100 |
| commit | f34c304638258eb1d30a7fab942313199c65cc3f (patch) | |
| tree | bf142905e8f9eb845e1a1ed127b568b4c217bbc3 /include/vcl | |
| parent | a25acac2a6c7770bb07ced4c29b3b9009ad7ff14 (diff) | |
tdf#137643 Revert "lock refreshing font data when loading a document"
from tdf#69060, to replace with an alternative solution
This reverts commit 98d71c4e0847797a4ba9229a8e6d832a8a3d5e0f.
and
This reverts commit 64d8e5f8db70f4f913abb902b41f4cff8dd1cdad.
Change-Id: I384e994b54aa1bfc735c6ab591b9b1410058451f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 60664ce3de02..ea8292909a39 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1292,9 +1292,6 @@ public: //If bNewFontLists is true then drop and refetch lists of system fonts SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); - // Lock font updates for all output devices - static void LockFontUpdates(bool bLock); - protected: SAL_DLLPRIVATE const LogicalFontInstance* GetFontInstance() const; SAL_DLLPRIVATE tools::Long GetEmphasisAscent() const { return mnEmphasisAscent; } diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index e5ecc5cb499d..b1d7759765c3 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1307,17 +1307,6 @@ public: ///@} - /** Lock font updates for all output devices - - @remark When performing operations that might involve multiple registration of fonts, such as - opening/closing documents with multiple embedded fonts, then each font addition/removal - might cause an event that initiates a rebuild of each OutputDevice's font lists. - - Locking font updates disables processing such events, and unlocking causes a single such - processing for all OutputDevices. - */ - static void LockFontUpdates(bool bLock); - // For vclbootstrapprotector: static void setDeInitHook(Link<LinkParamNone*,void> const & hook); |