diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-10 11:04:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-19 01:04:00 +0000 |
| commit | 6b7354ae66db40246a09e00aa876443057655a43 (patch) | |
| tree | e7eb5d71ecd2a6ec8110945a946549500dae7a8a /sfx2 | |
| parent | 5120b3f30614f6e4988c512577da1d70be8d25b1 (diff) | |
for testing allow disabling configmgr for time critical paths
Change-Id: I08021f18d53e1748927f8847649994f95252bbc2
Reviewed-on: https://gerrit.libreoffice.org/17844
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/shell.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 607a56191063..5bfac57f1a4f 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -28,7 +28,7 @@ #include "itemdel.hxx" #include <svtools/asynclink.hxx> #include <basic/sbx.hxx> - +#include <unotools/configmgr.hxx> #include <sfx2/app.hxx> #include <sfx2/shell.hxx> #include <sfx2/bindings.hxx> @@ -223,9 +223,11 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ) // a supported scenario (/me thinks it is not), then we would need to notify all such clients instances. pUndoMgr = pNewUndoMgr; - if ( pUndoMgr ) + if (pUndoMgr && !utl::ConfigManager::IsAvoidConfig()) + { pUndoMgr->SetMaxUndoActionCount( officecfg::Office::Common::Undo::Steps::get()); + } } SfxRepeatTarget* SfxShell::GetRepeatTarget() const |