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, 24 insertions, 24 deletions

diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx
index 511d7695c471..8b275b231b28 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.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
@@ -44,10 +44,10 @@
 
 struct ScAutoStyleInitData
 {
-    ScRange aRange;
-    String  aStyle1;
-    ULONG   nTimeout;
-    String  aStyle2;
+    ScRange	aRange;
+    String	aStyle1;
+    ULONG	nTimeout;
+    String	aStyle2;
 
     ScAutoStyleInitData( const ScRange& rR, const String& rSt1, ULONG nT, const String& rSt2 ) :
         aRange(rR), aStyle1(rSt1), nTimeout(nT), aStyle2(rSt2) {}
@@ -55,9 +55,9 @@ struct ScAutoStyleInitData
 
 struct ScAutoStyleData
 {
-    ULONG   nTimeout;
-    ScRange aRange;
-    String  aStyle;
+    ULONG	nTimeout;
+    ScRange	aRange;
+    String	aStyle;
 
     ScAutoStyleData( ULONG nT, const ScRange& rR, const String& rT ) :
         nTimeout(nT), aRange(rR), aStyle(rT) {}
@@ -65,7 +65,7 @@ struct ScAutoStyleData
 
 //==================================================================
 
-inline ULONG TimeNow()          // Sekunden
+inline ULONG TimeNow()			// Sekunden
 {
     return (ULONG) time(0);
 }
@@ -93,7 +93,7 @@ ScAutoStyleList::~ScAutoStyleList()
 
 //==================================================================
 
-//  initial short delay (asynchronous call)
+//	initial short delay (asynchronous call)
 
 void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1,
                                     ULONG nTimeout, const String& rStyle2 )
@@ -111,10 +111,10 @@ IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG )
     {
         ScAutoStyleInitData* pData = (ScAutoStyleInitData*) aInitials.GetObject(i);
 
-        //  apply first style immediately
+        //	apply first style immediately
         pDocSh->DoAutoStyle( pData->aRange, pData->aStyle1 );
 
-        //  add second style to list
+        //	add second style to list
         if ( pData->nTimeout )
             AddEntry( pData->nTimeout, pData->aRange, pData->aStyle2 );
 
@@ -132,7 +132,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
     aTimer.Stop();
     ULONG nNow = TimeNow();
 
-    //  alten Eintrag loeschen
+    //	alten Eintrag loeschen
 
     ULONG nCount = aEntries.Count();
     ULONG i;
@@ -144,11 +144,11 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
             delete pData;
             aEntries.Remove(i);
             --nCount;
-            break;                      // nicht weitersuchen - es kann nur einen geben
+            break;						// nicht weitersuchen - es kann nur einen geben
         }
     }
 
-    //  Timeouts von allen Eintraegen anpassen
+    //	Timeouts von allen Eintraegen anpassen
 
     if (nCount && nNow != nTimerStart)
     {
@@ -156,7 +156,7 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
         AdjustEntries((nNow-nTimerStart)*1000);
     }
 
-    //  Einfuege-Position suchen
+    //	Einfuege-Position suchen
 
     ULONG nPos = LIST_APPEND;
     for (i=0; i<nCount && nPos == LIST_APPEND; i++)
@@ -166,22 +166,22 @@ void ScAutoStyleList::AddEntry( ULONG nTimeout, const ScRange& rRange, const Str
     ScAutoStyleData* pNew = new ScAutoStyleData( nTimeout, rRange, rStyle );
     aEntries.Insert( pNew, nPos );
 
-    //  abgelaufene ausfuehren, Timer neu starten
+    //	abgelaufene ausfuehren, Timer neu starten
 
     ExecuteEntries();
     StartTimer(nNow);
 }
 
-void ScAutoStyleList::AdjustEntries( ULONG nDiff )  // Millisekunden
+void ScAutoStyleList::AdjustEntries( ULONG nDiff )	// Millisekunden
 {
     ULONG nCount = aEntries.Count();
     for (ULONG i=0; i<nCount; i++)
     {
         ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
         if ( pData->nTimeout <= nDiff )
-            pData->nTimeout = 0;                    // abgelaufen
+            pData->nTimeout = 0;					// abgelaufen
         else
-            pData->nTimeout -= nDiff;               // weiterzaehlen
+            pData->nTimeout -= nDiff;				// weiterzaehlen
     }
 }
 
@@ -190,7 +190,7 @@ void ScAutoStyleList::ExecuteEntries()
     ScAutoStyleData* pData;
     while ((pData = (ScAutoStyleData*) aEntries.GetObject(0)) != NULL && pData->nTimeout == 0)
     {
-        pDocSh->DoAutoStyle( pData->aRange, pData->aStyle );    //! oder Request ???
+        pDocSh->DoAutoStyle( pData->aRange, pData->aStyle );	//! oder Request ???
 
         delete pData;
         aEntries.Remove((ULONG)0);
@@ -206,14 +206,14 @@ void ScAutoStyleList::ExecuteAllNow()
     {
         ScAutoStyleData* pData = (ScAutoStyleData*) aEntries.GetObject(i);
 
-        pDocSh->DoAutoStyle( pData->aRange, pData->aStyle );    //! oder Request ???
+        pDocSh->DoAutoStyle( pData->aRange, pData->aStyle );	//! oder Request ???
 
         delete pData;
     }
     aEntries.Clear();
 }
 
-void ScAutoStyleList::StartTimer( ULONG nNow )      // Sekunden
+void ScAutoStyleList::StartTimer( ULONG nNow )		// Sekunden
 {
     // ersten Eintrag mit Timeout != 0 suchen
 
@@ -233,7 +233,7 @@ void ScAutoStyleList::StartTimer( ULONG nNow )      // Sekunden
 IMPL_LINK( ScAutoStyleList, TimerHdl, Timer*, EMPTYARG )
 {
     ULONG nNow = TimeNow();
-    AdjustEntries(aTimer.GetTimeout());             // eingestellte Wartezeit
+    AdjustEntries(aTimer.GetTimeout());				// eingestellte Wartezeit
     ExecuteEntries();
     StartTimer(nNow);