[Libreoffice-commits] core.git: sc/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue May 5 11:22:27 UTC 2020
sc/source/core/data/documen8.cxx | 10 ----------
1 file changed, 10 deletions(-)
New commits:
commit a46cf617e39be24f16d074c836d558eaa7f1f336
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 5 09:14:20 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 13:21:52 2020 +0200
IdleCalcTextWidthScope uses SfxStyleSheetBasePool::Find
with a SfxStyleFamily::Page arg so there no need to call
SetSearchMask(SfxStyleFamily::Page) on the SfxStyleSheetBasePool
so then there's no need to save and restore the family and mask because we
don't change it and don't need to use it.
Change-Id: I6677731d680a72554a1c02b3008b62d47aa8b568
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93454
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 14929e65ff19..85ecfd3d94a9 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -474,8 +474,6 @@ class IdleCalcTextWidthScope : public TaskStopwatch
ScAddress& mrCalcPos;
MapMode maOldMapMode;
ScStyleSheetPool* mpStylePool;
- SfxStyleSearchBits mnOldSearchMask;
- SfxStyleFamily meOldFamily;
bool mbNeedMore;
bool mbProgress;
@@ -484,17 +482,10 @@ public:
mrDoc(rDoc),
mrCalcPos(rCalcPos),
mpStylePool(rDoc.GetStyleSheetPool()),
- mnOldSearchMask(mpStylePool->GetSearchMask()),
- meOldFamily(mpStylePool->GetSearchFamily()),
mbNeedMore(false),
mbProgress(false)
{
- // The old search mask / family flags must be restored so that e.g.
- // the styles dialog shows correct listing when it's opened in-between
- // the calls.
-
mrDoc.EnableIdle(false);
- mpStylePool->SetSearchMask(SfxStyleFamily::Page);
}
~IdleCalcTextWidthScope() COVERITY_NOEXCEPT_FALSE
@@ -506,7 +497,6 @@ public:
if (mbProgress)
ScProgress::DeleteInterpretProgress();
- mpStylePool->SetSearchMask(meOldFamily, mnOldSearchMask);
mrDoc.EnableIdle(true);
}
More information about the Libreoffice-commits
mailing list