summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-05-05 09:14:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-05-05 13:21:52 +0200
commita46cf617e39be24f16d074c836d558eaa7f1f336 (patch)
treea447f89d3ca19cb8ac1bd6c1f1d8e4d797e8865f
parent69ee8dbb70ca10c7884edd0925e01ec76ae043d8 (diff)
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@redhat.com>
-rw-r--r--sc/source/core/data/documen8.cxx10
1 files changed, 0 insertions, 10 deletions
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);
}