diff options
author | Michael Stahl <mst@openoffice.org> | 2010-11-25 14:31:11 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2010-11-25 14:31:11 +0100 |
commit | d2ab337e8fd277143ac7e811f9f12ea15c592f6e (patch) | |
tree | 529613350e6ee7c7cc1050907e3630bd48986497 /sw/source/ui/inc | |
parent | 0cf92721c0f308a4644763b3bea0e0d6804ff268 (diff) |
unodapi: #i115383#: clean up UndoActionCount:
remove static {Get,Set}UndoActionCount() from SwDoc, UndoManager, SwEditShell.
use the already existing UndoOptions in SwModule instead.
refactor the ugly hack with undo in SwInputWindow a little.
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/inputwin.hxx | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/ui/inc/inputwin.hxx index 8693572d167f..c752b723937f 100644 --- a/sw/source/ui/inc/inputwin.hxx +++ b/sw/source/ui/inc/inputwin.hxx @@ -27,17 +27,11 @@ #ifndef SW_INPUTWIN_HXX #define SW_INPUTWIN_HXX - -#ifndef _MENU_HXX //autogen +#include <vcl/edit.hxx> #include <vcl/menu.hxx> -#endif -#include <sfx2/childwin.hxx> -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _EDIT_HXX //autogen -#include <vcl/edit.hxx> -#endif + +#include <sfx2/childwin.hxx> class SwFldMgr; class SwWrtShell; @@ -72,16 +66,17 @@ friend class InputEdit; SwView* pView; SfxBindings* pBindings; String aAktTableName, sOldFml; - USHORT nActionCnt; + sal_Int32 m_nActionCount; BOOL bFirst : 1; //Initialisierungen beim ersten Aufruf BOOL bActive : 1; //fuer Hide/Show beim Dokumentwechsel BOOL bIsTable : 1; BOOL bDelSel : 1; - BOOL bDoesUndo : 1; - BOOL bResetUndo : 1; - BOOL bCallUndo : 1; + bool m_bDoesUndo : 1; + bool m_bResetUndo : 1; + bool m_bCallUndo : 1; + void CleanupUglyHackWithUndo(); void DelBoxCntnt(); DECL_LINK( ModifyHdl, InputEdit* ); |