[Libreoffice-commits] core.git: Branch 'feature/cib_contract136' - include/svx sd/source
Katarina Behrens
Katarina.Behrens at cib.de
Mon Feb 19 16:58:41 UTC 2018
include/svx/svdmodel.hxx | 1 +
sd/source/core/drawdoc4.cxx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2a37809c176721aa374f51071684663bcbc38161
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date: Mon Feb 19 14:37:19 2018 +0100
Don't reformat all connectors every time spellchecking timer fires
Editing document with many (~1k) connectors eats all available CPU
power otherwise, as on every spellchecking event soffice tries to
reposition ALL connectors in entire document
Change-Id: I647b7309729dce153b8e05eff4677fe7bb9840a7
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index d90671311e76..d91520b3532a 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -565,6 +565,7 @@ public:
// set of api calls.
bool isLocked() const { return mbModelLocked; }
void setLock( bool bLock );
+ void setLockSimple( bool bLock ) { mbModelLocked = bLock; }
void SetForbiddenCharsTable( const rtl::Reference<SvxForbiddenCharactersTable>& xForbiddenChars );
rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const { return mpForbiddenCharactersTable;}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index e151b8bcbae7..13a9a6f557f2 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -916,7 +916,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
pObj->BroadcastObjectChange();
if ( pModel )
- pModel->setLock(bLock);
+ bLock ? pModel->setLock(bLock) : pModel->setLockSimple(bLock);
}
}
More information about the Libreoffice-commits
mailing list