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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 2f8a2c5f7779..d5803e1b0029 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -567,10 +567,6 @@ bool SfxObjectShell::ImportFromGeneratedStream_Impl( bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { ModifyBlocker_Impl aBlock( this ); - struct FontLockGuard { - FontLockGuard() { Application::LockFontUpdates(true); } - ~FontLockGuard() { Application::LockFontUpdates(false); } - } aFontLockGuard; pMedium = pMed; pMedium->CanDisposeStorage_Impl( true ); |