recreated tag libreoffice-3.3.0.4 which had these commits:

commit 5e369f0d3b306be13606c1558ecf7d0aac0048f4 (tag: refs/tags/libreoffice-3.3.0.4)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 18 19:01:15 2011 +0100

Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)

commit 2df81fdef39f29be15dc0a6e12031916de963f08
Author: Kohei Yoshida <kyoshida@novell.com>
Date:   Thu Jan 13 11:18:07 2011 -0500

Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.

I created a patch between before and after the merge commit, and
reverse-applied it.  This is because if you revert a merge commit
in git you are denying all future merges from that branch.  I wasn't
sure if we really wanted that.

Signed-off-by: Petr Mladek <pmladek@suse.cz>

sc/inc/document.hxx                      |   22 +------
sc/inc/drwlayer.hxx                      |    2 +-
sc/inc/table.hxx                         |   16 +-----
sc/source/core/data/document.cxx         |    7 +--
sc/source/core/data/drwlayer.cxx         |    6 +-
sc/source/core/data/table1.cxx           |   38 ++++--------
sc/source/core/data/table2.cxx           |   91 ++++++------------------------
sc/source/core/data/table3.cxx           |   71 +----------------------
sc/source/filter/xml/xmlrowi.cxx         |   17 +----
sc/source/ui/docshell/externalrefmgr.cxx |    7 +-
sc/source/ui/view/dbfunc.cxx             |    5 +-
sc/source/ui/view/tabvwshe.cxx           |    4 +-
12 files changed, 52 insertions(+), 234 deletions(-)

commit 9ce94f52e8c404a5e19154d38c18a44281d961f0
Author: Kohei Yoshida <kyoshida@novell.com>
Date:   Thu Jan 13 11:04:14 2011 -0500

Revert "This is also part of the merge."

This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.

Signed-off-by: Petr Mladek <pmladek@suse.cz>

sc/source/core/data/table3.cxx |    3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

commit 1e03f54cc4f8939867869a3570f56d0645b515f5
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 11 22:59:36 2011 +0100

Branch libreoffice-3-3-0

This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.

If you want to build something cool, unstable, and risky, use master.

1 files changed, 182 insertions, 182 deletions

diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index f73e664a5bcd..6b25be0ef684 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -65,30 +65,30 @@
 
 // STATIC DATA ---------------------------------------------------------------
 
-TYPEINIT1(ScUndoDeleteContents,     SfxUndoAction);
-TYPEINIT1(ScUndoFillTable,          SfxUndoAction);
-TYPEINIT1(ScUndoSelectionAttr,      SfxUndoAction);
-TYPEINIT1(ScUndoAutoFill,           SfxUndoAction);
-TYPEINIT1(ScUndoMerge,              SfxUndoAction);
-TYPEINIT1(ScUndoAutoFormat,         SfxUndoAction);
-TYPEINIT1(ScUndoReplace,            SfxUndoAction);
-TYPEINIT1(ScUndoTabOp,              SfxUndoAction);
+TYPEINIT1(ScUndoDeleteContents, 	SfxUndoAction);
+TYPEINIT1(ScUndoFillTable,		 	SfxUndoAction);
+TYPEINIT1(ScUndoSelectionAttr,		SfxUndoAction);
+TYPEINIT1(ScUndoAutoFill,			SfxUndoAction);
+TYPEINIT1(ScUndoMerge,				SfxUndoAction);
+TYPEINIT1(ScUndoAutoFormat, 		SfxUndoAction);
+TYPEINIT1(ScUndoReplace,			SfxUndoAction);
+TYPEINIT1(ScUndoTabOp,				SfxUndoAction);
 TYPEINIT1(ScUndoConversion,         SfxUndoAction);
 TYPEINIT1(ScUndoRefConversion,      SfxUndoAction);
-TYPEINIT1(ScUndoRefreshLink,        SfxUndoAction);
-TYPEINIT1(ScUndoInsertAreaLink,     SfxUndoAction);
-TYPEINIT1(ScUndoRemoveAreaLink,     SfxUndoAction);
-TYPEINIT1(ScUndoUpdateAreaLink,     SfxUndoAction);
+TYPEINIT1(ScUndoRefreshLink,		SfxUndoAction);
+TYPEINIT1(ScUndoInsertAreaLink,		SfxUndoAction);
+TYPEINIT1(ScUndoRemoveAreaLink,		SfxUndoAction);
+TYPEINIT1(ScUndoUpdateAreaLink,		SfxUndoAction);
 
 
 // To Do:
-/*A*/   // SetOptimalHeight auf Dokument, wenn keine View
+/*A*/	// SetOptimalHeight auf Dokument, wenn keine View
 
 
 //============================================================================
-//  class ScUndoDeleteContents
+//	class ScUndoDeleteContents
 //
-//  Inhalte loeschen
+//	Inhalte loeschen
 
 //----------------------------------------------------------------------------
 
@@ -98,20 +98,20 @@ ScUndoDeleteContents::ScUndoDeleteContents(
                 ScDocument* pNewUndoDoc, BOOL bNewMulti,
                 USHORT nNewFlags, BOOL bObjects )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
-        aRange      ( rRange ),
-        aMarkData   ( rMark ),
-        pUndoDoc    ( pNewUndoDoc ),
-        pDrawUndo   ( NULL ),
-        nFlags      ( nNewFlags ),
-        bMulti      ( bNewMulti )   // ueberliquid
+        aRange		( rRange ),
+        aMarkData	( rMark ),
+        pUndoDoc	( pNewUndoDoc ),
+        pDrawUndo	( NULL ),
+        nFlags		( nNewFlags ),
+        bMulti		( bNewMulti )	// ueberliquid
 {
     if (bObjects)
         pDrawUndo = GetSdrUndoAction( pDocShell->GetDocument() );
 
-    if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) )     // keine Zelle markiert:
-        aMarkData.SetMarkArea( aRange );                            // Zelle unter Cursor markieren
+    if ( !(aMarkData.IsMarked() || aMarkData.IsMultiMarked()) )		// keine Zelle markiert:
+        aMarkData.SetMarkArea( aRange );							// Zelle unter Cursor markieren
 
     SetChangeTrack();
 }
@@ -130,7 +130,7 @@ __EXPORT ScUndoDeleteContents::~ScUndoDeleteContents()
 
 String __EXPORT ScUndoDeleteContents::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );    // "Loeschen"
+    return ScGlobal::GetRscString( STR_UNDO_DELETECONTENTS );	 // "Loeschen"
 }
 
 
@@ -157,15 +157,15 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
 
     USHORT nExtFlags = 0;
 
-    if (bUndo)  // nur Undo
+    if (bUndo)	// nur Undo
     {
-        USHORT nUndoFlags = IDF_NONE;       //  entweder alle oder keine Inhalte kopieren
-        if (nFlags & IDF_CONTENTS)          //  (es sind nur die richtigen ins UndoDoc kopiert worden)
+        USHORT nUndoFlags = IDF_NONE;		//	entweder alle oder keine Inhalte kopieren
+        if (nFlags & IDF_CONTENTS)			//	(es sind nur die richtigen ins UndoDoc kopiert worden)
             nUndoFlags |= IDF_CONTENTS;
         if (nFlags & IDF_ATTRIB)
             nUndoFlags |= IDF_ATTRIB;
-        if (nFlags & IDF_EDITATTR)          // Edit-Engine-Attribute
-            nUndoFlags |= IDF_STRING;       // -> Zellen werden geaendert
+        if (nFlags & IDF_EDITATTR)			// Edit-Engine-Attribute
+            nUndoFlags |= IDF_STRING;		// -> Zellen werden geaendert
         // do not create clones of note captions, they will be restored via drawing undo
         nUndoFlags |= IDF_NOCAPTIONS;
 
@@ -182,11 +182,11 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
         if ( pChangeTrack )
             pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
 
-        pDocShell->UpdatePaintExt( nExtFlags, aRange );             // content after the change
+        pDocShell->UpdatePaintExt( nExtFlags, aRange );				// content after the change
     }
-    else        // nur Redo
+    else		// nur Redo
     {
-        pDocShell->UpdatePaintExt( nExtFlags, aRange );             // content before the change
+        pDocShell->UpdatePaintExt( nExtFlags, aRange );				// content before the change
 
         aMarkData.MarkToMulti();
         RedoSdrUndoAction( pDrawUndo );
@@ -200,7 +200,7 @@ void ScUndoDeleteContents::DoChange( const BOOL bUndo )
 
     if ( !( (pViewShell) && pViewShell->AdjustRowHeight(
                                 aRange.aStart.Row(), aRange.aEnd.Row() ) ) )
-/*A*/   pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/	pDocShell->PostPaint( aRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
 
     pDocShell->PostDataChanged();
     if (pViewShell)
@@ -266,10 +266,10 @@ BOOL __EXPORT ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoFillTable
+//	class ScUndoFillTable
 //
-//  Tabellen ausfuellen
-//  (Bearbeiten|Ausfuellen|...)
+//	Tabellen ausfuellen
+//	(Bearbeiten|Ausfuellen|...)
 
 //----------------------------------------------------------------------------
 
@@ -280,17 +280,17 @@ ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
                 ScDocument* pNewUndoDoc, BOOL bNewMulti, SCTAB nSrc,
                 USHORT nFlg, USHORT nFunc, BOOL bSkip, BOOL bLink )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
-        aRange      ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
-        aMarkData   ( rMark ),
-        pUndoDoc    ( pNewUndoDoc ),
-        nFlags      ( nFlg ),
-        nFunction   ( nFunc ),
-        nSrcTab     ( nSrc ),
-        bMulti      ( bNewMulti ),
-        bSkipEmpty  ( bSkip ),
-        bAsLink     ( bLink )
+        aRange		( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+        aMarkData	( rMark ),
+        pUndoDoc	( pNewUndoDoc ),
+        nFlags		( nFlg ),
+        nFunction	( nFunc ),
+        nSrcTab		( nSrc ),
+        bMulti		( bNewMulti ),
+        bSkipEmpty	( bSkip ),
+        bAsLink		( bLink )
 {
     SetChangeTrack();
 }
@@ -349,7 +349,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
     if (pViewShell)
         pViewShell->SetMarkData( aMarkData );
 
-    if (bUndo)  // nur Undo
+    if (bUndo)	// nur Undo
     {
         SCTAB nTabCount = pDoc->GetTableCount();
         ScRange aWorkRange(aRange);
@@ -369,7 +369,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
         if ( pChangeTrack )
             pChangeTrack->Undo( nStartChangeAction, nEndChangeAction );
     }
-    else        // nur Redo
+    else		// nur Redo
     {
         aMarkData.MarkToMulti();
         pDoc->FillTabMarked( nSrcTab, aMarkData, nFlags, nFunction, bSkipEmpty, bAsLink );
@@ -380,7 +380,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
     pDocShell->PostPaint(0,0,0,MAXCOL,MAXROW,MAXTAB, PAINT_GRID|PAINT_EXTRAS);
     pDocShell->PostDataChanged();
 
-    //  CellContentChanged kommt mit der Markierung
+    //	CellContentChanged kommt mit der Markierung
 
     if (pViewShell)
     {
@@ -388,7 +388,7 @@ void ScUndoFillTable::DoChange( const BOOL bUndo )
         if ( !aMarkData.GetTableSelect(nTab) )
             pViewShell->SetTabNo( nSrcTab );
 
-        pViewShell->DoneBlockMode();    // gibt sonst Probleme, weil Markierung auf falscher Tabelle
+        pViewShell->DoneBlockMode();	// gibt sonst Probleme, weil Markierung auf falscher Tabelle
     }
 }
 
@@ -431,9 +431,9 @@ BOOL __EXPORT ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoSelectionAttr
+//	class ScUndoSelectionAttr
 //
-//  Zellformat aendern
+//	Zellformat aendern
 
 //----------------------------------------------------------------------------
 
@@ -445,12 +445,12 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
                 const ScPatternAttr* pNewApply,
                 const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
-        aMarkData   ( rMark ),
-        aRange      ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
-        pUndoDoc    ( pNewUndoDoc ),
-        bMulti      ( bNewMulti )
+        aMarkData	( rMark ),
+        aRange		( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+        pUndoDoc	( pNewUndoDoc ),
+        bMulti		( bNewMulti )
 {
     ScDocumentPool* pPool = pDocShell->GetDocument()->GetPool();
     pApplyPattern = (ScPatternAttr*) &pPool->Put( *pNewApply );
@@ -500,7 +500,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
         pViewShell->SetMarkData( aMarkData );
 
     ScRange aEffRange( aRange );
-    if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) )         // zusammengefasste Zellen?
+    if ( pDoc->HasAttrib( aEffRange, HASATTR_MERGED ) )			// zusammengefasste Zellen?
         pDoc->ExtendMerge( aEffRange );
 
     USHORT nExtFlags = 0;
@@ -508,7 +508,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
 
     ChangeEditData(bUndo);
 
-    if (bUndo)  // nur bei Undo
+    if (bUndo)	// nur bei Undo
     {
         ScRange aCopyRange = aRange;
         SCTAB nTabCount = pDoc->GetTableCount();
@@ -516,7 +516,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
         aCopyRange.aEnd.SetTab(nTabCount-1);
         pUndoDoc->CopyToDocument( aCopyRange, IDF_ATTRIB, bMulti, pDoc, &aMarkData );
     }
-    else        // nur bei Redo
+    else		// nur bei Redo
     {
         aMarkData.MarkToMulti();
         pDoc->ApplySelectionPattern( *pApplyPattern, aMarkData );
@@ -527,7 +527,7 @@ void ScUndoSelectionAttr::DoChange( const BOOL bUndo )
     }
 
     if ( !( (pViewShell) && pViewShell->AdjustBlockHeight() ) )
-/*A*/   pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
+/*A*/	pDocShell->PostPaint( aEffRange, PAINT_GRID | PAINT_EXTRAS, nExtFlags );
 
     ShowTable( aRange );
 }
@@ -595,9 +595,9 @@ BOOL __EXPORT ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoAutoFill
+//	class ScUndoAutoFill
 //
-//  Auto-Fill (nur einfache Bloecke)
+//	Auto-Fill (nur einfache Bloecke)
 
 //----------------------------------------------------------------------------
 
@@ -608,18 +608,18 @@ ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
                 double fNewStartValue, double fNewStepValue, double fNewMaxValue,
                 USHORT nMaxShIndex )
         //
-    :   ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
+    :	ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
         //
-        aSource         ( rSourceArea ),
-        aMarkData       ( rMark ),
-        pUndoDoc        ( pNewUndoDoc ),
-        eFillDir        ( eNewFillDir ),
-        eFillCmd        ( eNewFillCmd ),
-        eFillDateCmd    ( eNewFillDateCmd ),
-        fStartValue     ( fNewStartValue ),
-        fStepValue      ( fNewStepValue ),
-        fMaxValue       ( fNewMaxValue ),
-        nMaxSharedIndex ( nMaxShIndex)
+        aSource			( rSourceArea ),
+        aMarkData		( rMark ),
+        pUndoDoc		( pNewUndoDoc ),
+        eFillDir		( eNewFillDir ),
+        eFillCmd		( eNewFillCmd ),
+        eFillDateCmd	( eNewFillDateCmd ),
+        fStartValue		( fNewStartValue ),
+        fStepValue		( fNewStepValue ),
+        fMaxValue		( fNewMaxValue ),
+        nMaxSharedIndex	( nMaxShIndex)
 {
     SetChangeTrack();
 }
@@ -725,7 +725,7 @@ void __EXPORT ScUndoAutoFill::Redo()
 {
     BeginRedo();
 
-//! Tabellen selektieren
+//!	Tabellen selektieren
 
     SCCOLROW nCount = 0;
     switch (eFillDir)
@@ -795,16 +795,16 @@ BOOL __EXPORT ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoMerge
+//	class ScUndoMerge
 //
-//  Zellen zusammenfassen / Zusammenfassung aufheben
+//	Zellen zusammenfassen / Zusammenfassung aufheben
 
 //----------------------------------------------------------------------------
 
 ScUndoMerge::ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
                           bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
         maOption(rOption),
         mbMergeContents( bMergeContents ),
@@ -951,9 +951,9 @@ BOOL ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoAutoFormat
+//	class ScUndoAutoFormat
 //
-//      Auto-Format (nur einfache Bloecke)
+//		Auto-Format (nur einfache Bloecke)
 
 //----------------------------------------------------------------------------
 
@@ -961,12 +961,12 @@ ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
                         const ScRange& rRange, ScDocument* pNewUndoDoc,
                         const ScMarkData& rMark, BOOL bNewSize, USHORT nNewFormatNo )
         //
-    :   ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
+    :	ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
         //
-        pUndoDoc    ( pNewUndoDoc ),
-        aMarkData   ( rMark ),
-        bSize       ( bNewSize ),
-        nFormatNo   ( nNewFormatNo )
+        pUndoDoc	( pNewUndoDoc ),
+        aMarkData	( rMark ),
+        bSize		( bNewSize ),
+        nFormatNo	( nNewFormatNo )
 {
 }
 
@@ -983,7 +983,7 @@ __EXPORT ScUndoAutoFormat::~ScUndoAutoFormat()
 
 String __EXPORT ScUndoAutoFormat::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT );   //"Auto-Format"
+    return ScGlobal::GetRscString( STR_UNDO_AUTOFORMAT );	//"Auto-Format"
 }
 
 
@@ -996,8 +996,8 @@ void __EXPORT ScUndoAutoFormat::Undo()
     ScDocument* pDoc = pDocShell->GetDocument();
 
     // Attribute
-//  pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
-//  pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
+//	pDoc->DeleteAreaTab( aBlockRange, IDF_ATTRIB );
+//	pUndoDoc->CopyToDocument( aBlockRange, IDF_ATTRIB, FALSE, pDoc );
 
     SCTAB nTabCount = pDoc->GetTableCount();
     pDoc->DeleteArea( aBlockRange.aStart.Col(), aBlockRange.aStart.Row(),
@@ -1066,12 +1066,12 @@ void __EXPORT ScUndoAutoFormat::Redo()
         }
         else
         {
-            //  Zoom auf 100 lassen
+            //	Zoom auf 100 lassen
             nPPTX = ScGlobal::nScreenPPTX;
             nPPTY = ScGlobal::nScreenPPTY;
         }
 
-        BOOL bFormula = FALSE;  //! merken
+        BOOL bFormula = FALSE;	//! merken
 
         for (SCTAB nTab=nStartZ; nTab<=nEndZ; nTab++)
         {
@@ -1133,9 +1133,9 @@ BOOL __EXPORT ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoReplace
+//	class ScUndoReplace
 //
-//      Ersetzen
+//		Ersetzen
 
 //----------------------------------------------------------------------------
 
@@ -1144,12 +1144,12 @@ ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
                                     const String& rNewUndoStr, ScDocument* pNewUndoDoc,
                                     const SvxSearchItem* pItem )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
-        aCursorPos  ( nCurX, nCurY, nCurZ ),
-        aMarkData   ( rMark ),
-        aUndoStr    ( rNewUndoStr ),
-        pUndoDoc    ( pNewUndoDoc )
+        aCursorPos	( nCurX, nCurY, nCurZ ),
+        aMarkData	( rMark ),
+        aUndoStr	( rNewUndoStr ),
+        pUndoDoc	( pNewUndoDoc )
 {
     pSearchItem = new SvxSearchItem( *pItem );
     SetChangeTrack();
@@ -1174,10 +1174,10 @@ void ScUndoReplace::SetChangeTrack()
     if ( pChangeTrack )
     {
         if ( pUndoDoc )
-        {   //! im UndoDoc stehen nur die geaenderten Zellen,
+        {	//! im UndoDoc stehen nur die geaenderten Zellen,
             // deswegen per Iterator moeglich
             pChangeTrack->AppendContentsIfInRefDoc( pUndoDoc,
-                nStartChangeAction, nEndChangeAction );
+                nStartChangeAction,	nEndChangeAction );
         }
         else
         {
@@ -1198,7 +1198,7 @@ void ScUndoReplace::SetChangeTrack()
 
 String __EXPORT ScUndoReplace::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_REPLACE );  // "Ersetzen"
+    return ScGlobal::GetRscString( STR_UNDO_REPLACE );	// "Ersetzen"
 }
 
 
@@ -1213,7 +1213,7 @@ void __EXPORT ScUndoReplace::Undo()
 
     ShowTable( aCursorPos.Tab() );
 
-    if (pUndoDoc)       // nur bei ReplaceAll !!
+    if (pUndoDoc)		// nur bei ReplaceAll !!
     {
         DBG_ASSERT(pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE_ALL,
                    "ScUndoReplace:: Falscher Modus");
@@ -1221,22 +1221,22 @@ void __EXPORT ScUndoReplace::Undo()
         if (pViewShell)
             pViewShell->SetMarkData( aMarkData );
 
-//! markierte Tabellen
-//! Bereich merken ?
+//!	markierte Tabellen
+//!	Bereich merken ?
 
-        //  Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
-        //  kopieren, um Outline-Gruppen nicht kaputtzumachen.
+        //	Undo-Dokument hat keine Zeilen-/Spalten-Infos, also mit bColRowFlags = FALSE
+        //	kopieren, um Outline-Gruppen nicht kaputtzumachen.
 
         USHORT nUndoFlags = (pSearchItem->GetPattern()) ? IDF_ATTRIB : IDF_CONTENTS;
         pUndoDoc->CopyToDocument( 0,      0,      0,
                                   MAXCOL, MAXROW, MAXTAB,
-                                  nUndoFlags, FALSE, pDoc, NULL, FALSE );   // ohne Row-Flags
+                                  nUndoFlags, FALSE, pDoc, NULL, FALSE );	// ohne Row-Flags
         pDocShell->PostPaintGridAll();
     }
     else if (pSearchItem->GetPattern() &&
              pSearchItem->GetCommand() == SVX_SEARCHCMD_REPLACE)
     {
-        String aTempStr = pSearchItem->GetSearchString();       // vertauschen
+        String aTempStr = pSearchItem->GetSearchString();		// vertauschen
         pSearchItem->SetSearchString(pSearchItem->GetReplaceString());
         pSearchItem->SetReplaceString(aTempStr);
         pDoc->ReplaceStyle( *pSearchItem,
@@ -1337,9 +1337,9 @@ BOOL __EXPORT ScUndoReplace::CanRepeat(SfxRepeatTarget& rTarget) const
 
 
 //============================================================================
-//  class ScUndoTabOp
+//	class ScUndoTabOp
 //
-//  Mehrfachoperation (nur einfache Bloecke)
+//	Mehrfachoperation (nur einfache Bloecke)
 
 //----------------------------------------------------------------------------
 
@@ -1352,15 +1352,15 @@ ScUndoTabOp::ScUndoTabOp( ScDocShell* pNewDocShell,
                 const ScRefAddress& rColCell,
                 BYTE nMd )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
-        aRange          ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
-        pUndoDoc        ( pNewUndoDoc ),
-        theFormulaCell  ( rFormulaCell ),
-        theFormulaEnd   ( rFormulaEnd ),
-        theRowCell      ( rRowCell ),
-        theColCell      ( rColCell ),
-        nMode           ( nMd )
+        aRange			( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
+        pUndoDoc		( pNewUndoDoc ),
+        theFormulaCell	( rFormulaCell ),
+        theFormulaEnd	( rFormulaEnd ),
+        theRowCell		( rRowCell ),
+        theColCell		( rColCell ),
+        nMode			( nMd )
 {
 }
 
@@ -1377,7 +1377,7 @@ __EXPORT ScUndoTabOp::~ScUndoTabOp()
 
 String __EXPORT ScUndoTabOp::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_TABOP );    // "Mehrfachoperation"
+    return ScGlobal::GetRscString( STR_UNDO_TABOP );	// "Mehrfachoperation"
 }
 
 
@@ -1443,7 +1443,7 @@ BOOL __EXPORT ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
 //============================================================================
 //  class ScUndoConversion
 //
-//  Spelling
+//	Spelling
 
 //----------------------------------------------------------------------------
 
@@ -1524,7 +1524,7 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo
             pViewShell->SetMarkData( aMarkData );
 
         SCTAB nTabCount = pDoc->GetTableCount();
-        //  Undo/Redo-doc has only selected tables
+        //	Undo/Redo-doc has only selected tables
 
         BOOL bMulti = aMarkData.IsMultiMarked();
         pRefDoc->CopyToDocument( 0,      0,      0,
@@ -1583,7 +1583,7 @@ BOOL ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
 //============================================================================
 //  class ScUndoRefConversion
 //
-//  cell reference conversion
+//	cell reference conversion
 
 //----------------------------------------------------------------------------
 
@@ -1592,9 +1592,9 @@ ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
                                          ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, BOOL bNewMulti, USHORT nNewFlag) :
 ScSimpleUndo( pNewDocShell ),
 aMarkData   ( rMark ),
-pUndoDoc    ( pNewUndoDoc ),
-pRedoDoc    ( pNewRedoDoc ),
-aRange      ( aMarkRange ),
+pUndoDoc	( pNewUndoDoc ),
+pRedoDoc	( pNewRedoDoc ),
+aRange  	( aMarkRange ),
 bMulti      ( bNewMulti ),
 nFlags      ( nNewFlag )
 {
@@ -1673,16 +1673,16 @@ BOOL __EXPORT ScUndoRefConversion::CanRepeat(SfxRepeatTarget& rTarget) const
     return (rTarget.ISA(ScTabViewTarget));
 }
 //============================================================================
-//  class ScUndoRefreshLink
+//	class ScUndoRefreshLink
 //
-//  Link aktualisieren / aendern
+//	Link aktualisieren / aendern
 
 //----------------------------------------------------------------------------
 
 ScUndoRefreshLink::ScUndoRefreshLink( ScDocShell* pNewDocShell,
                                     ScDocument* pNewUndoDoc )
         //
-    :   ScSimpleUndo( pNewDocShell ),
+    :	ScSimpleUndo( pNewDocShell ),
         //
         pUndoDoc( pNewUndoDoc ),
         pRedoDoc( NULL )
@@ -1732,7 +1732,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
                     pRedoDoc->AddUndoTab( nTab, nTab, TRUE, TRUE );
                 bFirst = FALSE;
                 pDoc->CopyToDocument(aRange, IDF_ALL, FALSE, pRedoDoc);
-//              pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
+//				pRedoDoc->TransferDrawPage( pDoc, nTab, nTab );
                 pRedoDoc->SetLink( nTab,
                                    pDoc->GetLinkMode(nTab),
                                    pDoc->GetLinkDoc(nTab),
@@ -1744,7 +1744,7 @@ void __EXPORT ScUndoRefreshLink::Undo()
 
             pDoc->DeleteAreaTab( aRange,IDF_ALL );
             pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
-//          pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
+//			pDoc->TransferDrawPage( pUndoDoc, nTab, nTab );
             pDoc->SetLink( nTab, pUndoDoc->GetLinkMode(nTab), pUndoDoc->GetLinkDoc(nTab),
                                  pUndoDoc->GetLinkFlt(nTab),  pUndoDoc->GetLinkOpt(nTab),
                                  pUndoDoc->GetLinkTab(nTab),
@@ -1774,7 +1774,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
 
             pDoc->DeleteAreaTab( aRange, IDF_ALL );
             pRedoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc );
-//          pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
+//			pDoc->TransferDrawPage( pRedoDoc, nTab, nTab );
             pDoc->SetLink( nTab,
                            pRedoDoc->GetLinkMode(nTab),
                            pRedoDoc->GetLinkDoc(nTab),
@@ -1794,7 +1794,7 @@ void __EXPORT ScUndoRefreshLink::Redo()
 
 void __EXPORT ScUndoRefreshLink::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  gippsnich
+    //	gippsnich
 }
 
 
@@ -1828,9 +1828,9 @@ ScAreaLink* lcl_FindAreaLink( sfx2::LinkManager* pLinkManager, const String& rDo
 
 
 //============================================================================
-//  class ScUndoInsertAreaLink
+//	class ScUndoInsertAreaLink
 //
-//  Bereichs-Verknuepfung einfuegen
+//	Bereichs-Verknuepfung einfuegen
 
 //----------------------------------------------------------------------------
 
@@ -1840,14 +1840,14 @@ ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
                             const String& rArea, const ScRange& rDestRange,
                             ULONG nRefresh )
         //
-    :   ScSimpleUndo    ( pShell ),
+    :	ScSimpleUndo	( pShell ),
         //
-        aDocName        ( rDoc ),
-        aFltName        ( rFlt ),
-        aOptions        ( rOpt ),
-        aAreaName       ( rArea ),
-        aRange          ( rDestRange ),
-        nRefreshDelay   ( nRefresh )
+        aDocName		( rDoc ),
+        aFltName		( rFlt ),
+        aOptions		( rOpt ),
+        aAreaName		( rArea ),
+        aRange			( rDestRange ),
+        nRefreshDelay	( nRefresh )
 {
 }
 
@@ -1879,7 +1879,7 @@ void __EXPORT ScUndoInsertAreaLink::Undo()
     if (pLink)
         pLinkManager->Remove( pLink );
 
-    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );     // Navigator
+    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 }
 
 
@@ -1898,7 +1898,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
     pLink->Update();
     pLink->SetInCreate( FALSE );
 
-    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );     // Navigator
+    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 }
 
 
@@ -1906,7 +1906,7 @@ void __EXPORT ScUndoInsertAreaLink::Redo()
 
 void __EXPORT ScUndoInsertAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //! ....
+    //!	....
 }
 
 
@@ -1919,9 +1919,9 @@ BOOL __EXPORT ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
 
 
 //============================================================================
-//  class ScUndoRemoveAreaLink
+//	class ScUndoRemoveAreaLink
 //
-//  Bereichs-Verknuepfung loeschen
+//	Bereichs-Verknuepfung loeschen
 
 //----------------------------------------------------------------------------
 
@@ -1930,14 +1930,14 @@ ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
                             const String& rArea, const ScRange& rDestRange,
                             ULONG nRefresh )
         //
-    :   ScSimpleUndo    ( pShell ),
+    :	ScSimpleUndo	( pShell ),
         //
-        aDocName        ( rDoc ),
-        aFltName        ( rFlt ),
-        aOptions        ( rOpt ),
-        aAreaName       ( rArea ),
-        aRange          ( rDestRange ),
-        nRefreshDelay   ( nRefresh )
+        aDocName		( rDoc ),
+        aFltName		( rFlt ),
+        aOptions		( rOpt ),
+        aAreaName		( rArea ),
+        aRange			( rDestRange ),
+        nRefreshDelay	( nRefresh )
 {
 }
 
@@ -1953,7 +1953,7 @@ __EXPORT ScUndoRemoveAreaLink::~ScUndoRemoveAreaLink()
 
 String __EXPORT ScUndoRemoveAreaLink::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );   //! eigener Text ??
+    return ScGlobal::GetRscString( STR_UNDO_REMOVELINK );	//! eigener Text ??
 }
 
 
@@ -1972,7 +1972,7 @@ void __EXPORT ScUndoRemoveAreaLink::Undo()
     pLink->Update();
     pLink->SetInCreate( FALSE );
 
-    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );     // Navigator
+    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 }
 
 
@@ -1988,7 +1988,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo()
     if (pLink)
         pLinkManager->Remove( pLink );
 
-    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );     // Navigator
+    SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) );		// Navigator
 }
 
 
@@ -1996,7 +1996,7 @@ void __EXPORT ScUndoRemoveAreaLink::Redo()
 
 void __EXPORT ScUndoRemoveAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  gippsnich
+    //	gippsnich
 }
 
 
@@ -2009,9 +2009,9 @@ BOOL __EXPORT ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) co
 
 
 //============================================================================
-//  class ScUndoUpdateAreaLink
+//	class ScUndoUpdateAreaLink
 //
-//  Bereichs-Verknuepfung aktualisieren
+//	Bereichs-Verknuepfung aktualisieren
 
 //----------------------------------------------------------------------------
 
@@ -2022,23 +2022,23 @@ ScUndoUpdateAreaLink::ScUndoUpdateAreaLink( ScDocShell* pShell,
                             const String& rNewA, const ScRange& rNewR, ULONG nNewRD,
                             ScDocument* pUndo, ScDocument* pRedo, BOOL bDoInsert )
         //
-    :   ScSimpleUndo( pShell ),
+    :	ScSimpleUndo( pShell ),
         //
-        aOldDoc     ( rOldD ),
-        aOldFlt     ( rOldF ),
-        aOldOpt     ( rOldO ),
-        aOldArea    ( rOldA ),
-        aOldRange   ( rOldR ),
-        aNewDoc     ( rNewD ),
-        aNewFlt     ( rNewF ),
-        aNewOpt     ( rNewO ),
-        aNewArea    ( rNewA ),
-        aNewRange   ( rNewR ),
-        pUndoDoc    ( pUndo ),
-        pRedoDoc    ( pRedo ),
-        nOldRefresh ( nOldRD ),
-        nNewRefresh ( nNewRD ),
-        bWithInsert ( bDoInsert )
+        aOldDoc		( rOldD ),
+        aOldFlt		( rOldF ),
+        aOldOpt		( rOldO ),
+        aOldArea	( rOldA ),
+        aOldRange	( rOldR ),
+        aNewDoc		( rNewD ),
+        aNewFlt		( rNewF ),
+        aNewOpt		( rNewO ),
+        aNewArea	( rNewA ),
+        aNewRange	( rNewR ),
+        pUndoDoc	( pUndo ),
+        pRedoDoc	( pRedo ),
+        nOldRefresh	( nOldRD ),
+        nNewRefresh	( nNewRD ),
+        bWithInsert	( bDoInsert )
 {
     DBG_ASSERT( aOldRange.aStart == aNewRange.aStart, "AreaLink verschoben ?" );
 }
@@ -2057,7 +2057,7 @@ __EXPORT ScUndoUpdateAreaLink::~ScUndoUpdateAreaLink()
 
 String __EXPORT ScUndoUpdateAreaLink::GetComment() const
 {
-    return ScGlobal::GetRscString( STR_UNDO_UPDATELINK );   //! eigener Text ??
+    return ScGlobal::GetRscString( STR_UNDO_UPDATELINK );	//! eigener Text ??
 }
 
 
@@ -2069,7 +2069,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
 
     SCCOL nEndX = Max( aOldRange.aEnd.Col(), aNewRange.aEnd.Col() );
     SCROW nEndY = Max( aOldRange.aEnd.Row(), aNewRange.aEnd.Row() );
-    SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() );    //?
+    SCTAB nEndZ = Max( aOldRange.aEnd.Tab(), aNewRange.aEnd.Tab() );	//?
 
     if ( bUndo )
     {
@@ -2105,7 +2105,7 @@ void ScUndoUpdateAreaLink::DoChange( const BOOL bUndo ) const
     ScRange aWorkRange( aNewRange.aStart, ScAddress( nEndX, nEndY, nEndZ ) );
     pDoc->ExtendMerge( aWorkRange, TRUE );
 
-    //  Paint
+    //	Paint
 
     if ( aNewRange.aEnd.Col() != aOldRange.aEnd.Col() )
         aWorkRange.aEnd.SetCol(MAXCOL);
@@ -2132,7 +2132,7 @@ void __EXPORT ScUndoUpdateAreaLink::Undo()
                                             aNewArea, aNewRange );
     if (pLink)
     {
-        pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea );        // alte Werte im Link
+        pLink->SetSource( aOldDoc, aOldFlt, aOldOpt, aOldArea );		// alte Werte im Link
         pLink->SetDestArea( aOldRange );
         pLink->SetRefreshDelay( nOldRefresh );
     }
@@ -2151,7 +2151,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
                                             aOldArea, aOldRange );
     if (pLink)
     {
-        pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea );        // neue Werte im Link
+        pLink->SetSource( aNewDoc, aNewFlt, aNewOpt, aNewArea );		// neue Werte im Link
         pLink->SetDestArea( aNewRange );
         pLink->SetRefreshDelay( nNewRefresh );
     }
@@ -2164,7 +2164,7 @@ void __EXPORT ScUndoUpdateAreaLink::Redo()
 
 void __EXPORT ScUndoUpdateAreaLink::Repeat(SfxRepeatTarget& /* rTarget */)
 {
-    //  gippsnich
+    //	gippsnich
 }