diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:51:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:51:43 +0000 |
| commit | 79d453b5a326b26905cd2c3dedf319cdae50dea9 (patch) | |
| tree | 4fa5ea596c359fe386cca2e10f5b7f9afd839630 /sc/source/ui/inc/undoblk.hxx | |
| parent | 22885399d9f6fd000923b8df85cdc06f6479f32c (diff) | |
INTEGRATION: CWS dr32 (1.10.196); FILE MERGED
2005/01/12 10:41:00 dr 1.10.196.1: #i34769# conversion parameter handling; restore cursor after conversion
Diffstat (limited to 'sc/source/ui/inc/undoblk.hxx')
| -rw-r--r-- | sc/source/ui/inc/undoblk.hxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 096c28afc79a..d9a6bb851ffa 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -2,9 +2,9 @@ * * $RCSfile: undoblk.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2004-07-23 10:53:05 $ + * last change: $Author: vg $ $Date: 2005-02-21 13:51:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,6 @@ * * ************************************************************************/ - #ifndef SC_UNDOBLK_HXX #define SC_UNDOBLK_HXX @@ -71,6 +70,9 @@ #ifndef SC_VIEWUTIL_HXX #include "viewutil.hxx" #endif +#ifndef SC_SPELLPARAM_HXX +#include "spellparam.hxx" +#endif class ScDocShell; class ScDocument; @@ -597,7 +599,7 @@ public: ScDocShell* pNewDocShell, const ScMarkData& rMark, SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc, SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocument* pNewRedoDoc, - ScConversionType eConvType ); + const ScConversionParam& rConvParam ); virtual ~ScUndoConversion(); virtual void Undo(); @@ -615,7 +617,7 @@ private: ScDocument* pRedoDoc; // Blockmarkierung und neue Daten ULONG nStartChangeAction; ULONG nEndChangeAction; - ScConversionType meConvType; + ScConversionParam maConvParam; /// Conversion type and parameters. void DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPos ); void SetChangeTrack(); |