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

diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 38e254f29fbd..0d84eecd5b03 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.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
@@ -67,10 +67,10 @@ enum ScVObjType
     VOBJ_TYPE_DRAW
 };
 
-#define MAX_OPT             (USHORT)VOPT_BIGHANDLES+1
-#define MAX_TYPE            (USHORT)VOBJ_TYPE_DRAW+1
+#define MAX_OPT				(USHORT)VOPT_BIGHANDLES+1
+#define MAX_TYPE			(USHORT)VOBJ_TYPE_DRAW+1
 
-#define SC_STD_GRIDCOLOR    COL_LIGHTGRAY
+#define SC_STD_GRIDCOLOR	COL_LIGHTGRAY
 
 //==================================================================
 // SvxGrid-Optionen mit Standard-Operatoren
@@ -82,10 +82,10 @@ public:
                 ScGridOptions() : SvxOptionsGrid() {}
                 ScGridOptions( const SvxOptionsGrid& rOpt ) : SvxOptionsGrid( rOpt ) {}
 
-    void                    SetDefaults();
-    const ScGridOptions&    operator=  ( const ScGridOptions& rCpy );
-    int                     operator== ( const ScGridOptions& rOpt ) const;
-    int                     operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); }
+    void					SetDefaults();
+    const ScGridOptions&	operator=  ( const ScGridOptions& rCpy );
+    int						operator== ( const ScGridOptions& rOpt ) const;
+    int						operator!= ( const ScGridOptions& rOpt ) const { return !(operator==(rOpt)); }
 };
 
 //==================================================================
@@ -99,31 +99,31 @@ public:
                 ScViewOptions( const ScViewOptions& rCpy );
                 ~ScViewOptions();
 
-    void                    SetDefaults();
+    void					SetDefaults();
 
-    void                    SetOption( ScViewOption eOpt, BOOL bNew = TRUE )    { aOptArr[eOpt] = bNew; }
-    BOOL                    GetOption( ScViewOption eOpt ) const                { return aOptArr[eOpt]; }
+    void					SetOption( ScViewOption eOpt, BOOL bNew = TRUE )	{ aOptArr[eOpt] = bNew; }
+    BOOL					GetOption( ScViewOption eOpt ) const 				{ return aOptArr[eOpt]; }
 
-    void                    SetObjMode( ScVObjType eObj, ScVObjMode eMode ) { aModeArr[eObj] = eMode; }
-    ScVObjMode              GetObjMode( ScVObjType eObj ) const             { return aModeArr[eObj]; }
+    void					SetObjMode( ScVObjType eObj, ScVObjMode eMode )	{ aModeArr[eObj] = eMode; }
+    ScVObjMode				GetObjMode( ScVObjType eObj ) const				{ return aModeArr[eObj]; }
 
-    void                    SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;}
-    Color                   GetGridColor( String* pStrName = NULL ) const;
+    void					SetGridColor( const Color& rCol, const String& rName ) { aGridCol = rCol; aGridColName = rName;}
+    Color					GetGridColor( String* pStrName = NULL ) const;
 
-    const ScGridOptions&    GetGridOptions() const                      { return aGridOpt; }
-    void                    SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
-    SvxGridItem*            CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const;
+    const ScGridOptions&	GetGridOptions() const 						{ return aGridOpt; }
+    void					SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
+    SvxGridItem*			CreateGridItem( USHORT nId = SID_ATTR_GRID_OPTIONS ) const;
 
-    const ScViewOptions&    operator=  ( const ScViewOptions& rCpy );
-    int                     operator== ( const ScViewOptions& rOpt ) const;
-    int                     operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); }
+    const ScViewOptions&	operator=  ( const ScViewOptions& rCpy );
+    int						operator== ( const ScViewOptions& rOpt ) const;
+    int						operator!= ( const ScViewOptions& rOpt ) const { return !(operator==(rOpt)); }
 
 private:
-    BOOL            aOptArr     [MAX_OPT];
-    ScVObjMode      aModeArr    [MAX_TYPE];
-    Color           aGridCol;
-    String          aGridColName;
-    ScGridOptions   aGridOpt;
+    BOOL			aOptArr		[MAX_OPT];
+    ScVObjMode		aModeArr	[MAX_TYPE];
+    Color			aGridCol;
+    String			aGridColName;
+    ScGridOptions	aGridOpt;
 };
 
 //==================================================================
@@ -142,10 +142,10 @@ public:
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = 0 ) const;
 
-    const ScViewOptions&    GetViewOptions() const { return theOptions; }
+    const ScViewOptions&	GetViewOptions() const { return theOptions; }
 
 private:
-    ScViewOptions   theOptions;
+    ScViewOptions	theOptions;
 };
 
 
@@ -155,9 +155,9 @@ private:
 
 class ScViewCfg : public ScViewOptions
 {
-    ScLinkConfigItem    aLayoutItem;
-    ScLinkConfigItem    aDisplayItem;
-    ScLinkConfigItem    aGridItem;
+    ScLinkConfigItem	aLayoutItem;
+    ScLinkConfigItem	aDisplayItem;
+    ScLinkConfigItem	aGridItem;
 
     DECL_LINK( LayoutCommitHdl, void* );
     DECL_LINK( DisplayCommitHdl, void* );
@@ -170,7 +170,7 @@ class ScViewCfg : public ScViewOptions
 public:
             ScViewCfg();
 
-    void            SetOptions( const ScViewOptions& rNew );
+    void			SetOptions( const ScViewOptions& rNew );
 };