diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-01-27 15:03:39 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-01-27 15:04:26 +0100 |
| commit | 452d86c9cbfb6b4b7e86426931a0d982dd8bb180 (patch) | |
| tree | 4f80b7cc380d731c71f566ee7e91b2e300126360 /sfx2/source/control | |
| parent | db59e4481614f58e111a86a1926e49fb523ebbae (diff) | |
Replace SvtUndoOptions with (simplified) direct configuration access.
Also, code in sw can be simplified under the premise that always
/org.openoffice.Office.Common/Undo/Steps > 0.
Diffstat (limited to 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/shell.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 74ce18457c3e..de879755459e 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -28,7 +28,9 @@ #include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/embed/VerbAttributes.hpp> +#include <comphelper/processfactory.hxx> #include <basic/sbstar.hxx> +#include <officecfg/Office/Common.hxx> #include <rtl/oustringostreaminserter.hxx> #include <sal/log.hxx> #include <svl/itempool.hxx> @@ -37,8 +39,6 @@ #include <svtools/asynclink.hxx> #include <basic/sbx.hxx> -#include <unotools/undoopt.hxx> - #include <sfx2/app.hxx> #include <sfx2/shell.hxx> #include <sfx2/bindings.hxx> @@ -486,7 +486,9 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr ) pUndoMgr = pNewUndoMgr; if ( pUndoMgr ) - pUndoMgr->SetMaxUndoActionCount( (sal_uInt16) SvtUndoOptions().GetUndoCount() ); + pUndoMgr->SetMaxUndoActionCount( + officecfg::Office::Common::Undo::Steps::get( + comphelper::getProcessComponentContext())); } //-------------------------------------------------------------------- |