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

diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index abab6086f99f..5b593d5691ed 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -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
@@ -36,83 +36,83 @@
 class ScMarkArray;
 class ScRangeList;
 
-//!     todo:
-//!     Es muss auch die Moeglichkeit geben, MarkArrays pro Tabelle zu halten,
-//!     damit "alle suchen" ueber mehrere Tabellen wieder funktioniert!
+//!		todo:
+//!		Es muss auch die Moeglichkeit geben, MarkArrays pro Tabelle zu halten,
+//!		damit "alle suchen" ueber mehrere Tabellen wieder funktioniert!
 
 
 class SC_DLLPUBLIC ScMarkData
 {
 private:
-    ScRange         aMarkRange;             // Bereich
-    ScRange         aMultiRange;            // maximaler Bereich insgesamt
-    ScMarkArray*    pMultiSel;              // Mehrfachselektion
-    BOOL            bTabMarked[MAXTABCOUNT];// Tabelle selektiert
-    BOOL            bMarked;                // Rechteck markiert
-    BOOL            bMultiMarked;           // mehrfach markiert
+    ScRange			aMarkRange;				// Bereich
+    ScRange			aMultiRange;			// maximaler Bereich insgesamt
+    ScMarkArray*	pMultiSel;				// Mehrfachselektion
+    BOOL			bTabMarked[MAXTABCOUNT];// Tabelle selektiert
+    BOOL			bMarked;				// Rechteck markiert
+    BOOL			bMultiMarked;			// mehrfach markiert
 
-    BOOL            bMarking;               // Bereich wird aufgezogen -> kein MarkToMulti
-    BOOL            bMarkIsNeg;             // Aufheben bei Mehrfachselektion
+    BOOL			bMarking;				// Bereich wird aufgezogen -> kein MarkToMulti
+    BOOL			bMarkIsNeg;				// Aufheben bei Mehrfachselektion
 
 public:
                 ScMarkData();
                 ScMarkData(const ScMarkData& rData);
                 ~ScMarkData();
 
-    ScMarkData& operator=(const ScMarkData& rData);
+    ScMarkData&	operator=(const ScMarkData& rData);
 
-    void        ResetMark();
-    void        SetMarkArea( const ScRange& rRange );
+    void		ResetMark();
+    void		SetMarkArea( const ScRange& rRange );
 
-    void        SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE );
+    void		SetMultiMarkArea( const ScRange& rRange, BOOL bMark = TRUE );
 
-    void        MarkToMulti();
-    void        MarkToSimple();
+    void		MarkToMulti();
+    void		MarkToSimple();
 
-    BOOL        IsMarked() const                { return bMarked; }
-    BOOL        IsMultiMarked() const           { return bMultiMarked; }
+    BOOL		IsMarked() const				{ return bMarked; }
+    BOOL		IsMultiMarked() const			{ return bMultiMarked; }
 
-    void        GetMarkArea( ScRange& rRange ) const;
-    void        GetMultiMarkArea( ScRange& rRange ) const;
+    void		GetMarkArea( ScRange& rRange ) const;
+    void		GetMultiMarkArea( ScRange& rRange ) const;
 
-    void        SetAreaTab( SCTAB nTab );
+    void		SetAreaTab( SCTAB nTab );
 
-    void        SelectTable( SCTAB nTab, BOOL bNew )        { bTabMarked[nTab] = bNew; }
-    BOOL        GetTableSelect( SCTAB nTab ) const          { return bTabMarked[nTab]; }
+    void		SelectTable( SCTAB nTab, BOOL bNew )		{ bTabMarked[nTab] = bNew; }
+    BOOL		GetTableSelect( SCTAB nTab ) const			{ return bTabMarked[nTab]; }
 
-    void        SelectOneTable( SCTAB nTab );
-    SCTAB       GetSelectCount() const;
-    SCTAB       GetFirstSelected() const;
+    void		SelectOneTable( SCTAB nTab );
+    SCTAB		GetSelectCount() const;
+    SCTAB		GetFirstSelected() const;
 
-    void        SetMarkNegative( BOOL bFlag )   { bMarkIsNeg = bFlag; }
-    BOOL        IsMarkNegative() const          { return bMarkIsNeg;  }
-    void        SetMarking( BOOL bFlag )        { bMarking = bFlag;   }
-    BOOL        GetMarkingFlag() const          { return bMarking;    }
+    void		SetMarkNegative( BOOL bFlag )	{ bMarkIsNeg = bFlag; }
+    BOOL		IsMarkNegative() const			{ return bMarkIsNeg;  }
+    void		SetMarking( BOOL bFlag )		{ bMarking = bFlag;   }
+    BOOL		GetMarkingFlag() const			{ return bMarking;	  }
 
-    //  fuer FillInfo / Document etc.
-    const ScMarkArray* GetArray() const         { return pMultiSel; }
+    //	fuer FillInfo / Document etc.
+    const ScMarkArray* GetArray() const			{ return pMultiSel; }
 
-    BOOL        IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const;
-    void        FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const;
-    void        ExtendRangeListTables( ScRangeList* pList ) const;
+    BOOL		IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple = FALSE ) const;
+    void		FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const;
+    void		ExtendRangeListTables( ScRangeList* pList ) const;
 
-    void        MarkFromRangeList( const ScRangeList& rList, BOOL bReset );
+    void		MarkFromRangeList( const ScRangeList& rList, BOOL bReset );
 
-    SCCOLROW    GetMarkColumnRanges( SCCOLROW* pRanges );
-    SCCOLROW    GetMarkRowRanges( SCCOLROW* pRanges );
+    SCCOLROW	GetMarkColumnRanges( SCCOLROW* pRanges );
+    SCCOLROW	GetMarkRowRanges( SCCOLROW* pRanges );
 
-    BOOL        IsColumnMarked( SCCOL nCol ) const;
-    BOOL        IsRowMarked( SCROW nRow ) const;
-    BOOL        IsAllMarked( const ScRange& rRange ) const;     // Multi
+    BOOL		IsColumnMarked( SCCOL nCol ) const;
+    BOOL		IsRowMarked( SCROW nRow ) const;
+    BOOL		IsAllMarked( const ScRange& rRange ) const;		// Multi
 
                 /// May return -1
-    SCsROW      GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const;
-    BOOL        HasMultiMarks( SCCOL nCol ) const;
-    BOOL        HasAnyMultiMarks() const;
+    SCsROW		GetNextMarked( SCCOL nCol, SCsROW nRow, BOOL bUp ) const;
+    BOOL		HasMultiMarks( SCCOL nCol ) const;
+    BOOL		HasAnyMultiMarks() const;
 
-    //  Tabellen-Markierungen anpassen:
-    void        InsertTab( SCTAB nTab );
-    void        DeleteTab( SCTAB nTab );
+    //	Tabellen-Markierungen anpassen:
+    void		InsertTab( SCTAB nTab );
+    void		DeleteTab( SCTAB nTab );
 };