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

diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index e59e836be501..c6025ffacf8a 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.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
@@ -51,25 +51,25 @@ class ScAddress;
 class ScTabDeletedHint : public SfxHint
 {
 private:
-    SCTAB   nTab;
+    SCTAB	nTab;
 public:
             TYPEINFO();
             ScTabDeletedHint( SCTAB nTabNo = SCTAB_MAX );
-    virtual ~ScTabDeletedHint();
+    virtual	~ScTabDeletedHint();
 
-    SCTAB   GetTab()    { return nTab; }
+    SCTAB	GetTab()	{ return nTab; }
 };
 
 class ScTabSizeChangedHint : public SfxHint
 {
 private:
-    SCTAB   nTab;
+    SCTAB	nTab;
 public:
             TYPEINFO();
             ScTabSizeChangedHint( SCTAB nTabNo = SCTAB_MAX );
-    virtual ~ScTabSizeChangedHint();
+    virtual	~ScTabSizeChangedHint();
 
-    SCTAB   GetTab()    { return nTab; }
+    SCTAB	GetTab()	{ return nTab; }
 };
 
 // -----------------------------------------------------------------------
@@ -99,101 +99,101 @@ public:
 class SC_DLLPUBLIC ScDrawLayer : public FmFormModel
 {
 private:
-//REMOVE        SotStorageRef   xPictureStorage;
-    String          aName;
-    ScDocument*     pDoc;
-    SdrUndoGroup*   pUndoGroup;
-    BOOL            bRecording;
-    BOOL            bAdjustEnabled;
-    BOOL            bHyphenatorSet;
+//REMOVE		SotStorageRef	xPictureStorage;
+    String			aName;
+    ScDocument*		pDoc;
+    SdrUndoGroup*	pUndoGroup;
+    BOOL			bRecording;
+    BOOL			bAdjustEnabled;
+    BOOL			bHyphenatorSet;
 
 private:
-    void            MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove,
+    void			MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove,
                                 const Point& rTopLeft );
-    void            MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
+    void			MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
                                 SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos );
 
     void            RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos );
 
 public:
                     ScDrawLayer( ScDocument* pDocument, const String& rName );
-    virtual         ~ScDrawLayer();
+    virtual			~ScDrawLayer();
 
     virtual SdrPage*  AllocPage(bool bMasterPage);
     virtual SdrModel* AllocModel() const;
-    virtual void    SetChanged( sal_Bool bFlg = sal_True );
+    virtual void	SetChanged( sal_Bool bFlg = sal_True );
 
     virtual Window* GetCurDocViewWin();
     virtual SvStream* GetDocumentStream(SdrDocumentStreamInfo& rStreamInfo) const;
 
     virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
 
-//REMOVE        void            ReleasePictureStorage();
+//REMOVE		void			ReleasePictureStorage();
 
-    BOOL            HasObjects() const;
+    BOOL			HasObjects() const;
 
     BOOL            ScAddPage( SCTAB nTab );
-    void            ScRemovePage( SCTAB nTab );
-    void            ScRenamePage( SCTAB nTab, const String& rNewName );
-    void            ScMovePage( USHORT nOldPos, USHORT nNewPos );
+    void			ScRemovePage( SCTAB nTab );
+    void			ScRenamePage( SCTAB nTab, const String& rNewName );
+    void			ScMovePage( USHORT nOldPos, USHORT nNewPos );
                     // inkl. Inhalt, bAlloc=FALSE -> nur Inhalt
-    void            ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc );
+    void			ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc );
 
-    ScDocument*     GetDocument() const { return pDoc; }
+    ScDocument*		GetDocument() const { return pDoc; }
 
-    void            UpdateBasic();              // DocShell-Basic in DrawPages setzen
-    void            UseHyphenator();
+    void			UpdateBasic();				// DocShell-Basic in DrawPages setzen
+    void			UseHyphenator();
 
-    BOOL            GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const;
+    BOOL			GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) const;
 
-                    //      automatische Anpassungen
+                    //		automatische Anpassungen
 
-    void            EnableAdjust( BOOL bSet = TRUE )    { bAdjustEnabled = bSet; }
+    void			EnableAdjust( BOOL bSet = TRUE )	{ bAdjustEnabled = bSet; }
 
-    void            BeginCalcUndo();
-    SdrUndoGroup*   GetCalcUndo();
-    BOOL            IsRecording() const         { return bRecording; }
-    void            AddCalcUndo( SdrUndoAction* pUndo );
+    void			BeginCalcUndo();
+    SdrUndoGroup*	GetCalcUndo();
+    BOOL			IsRecording() const			{ return bRecording; }
+    void			AddCalcUndo( SdrUndoAction* pUndo );
 
-    void            MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
+    void			MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
                                 SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos = true );
-    void            WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips );
-    void            HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips );
+    void			WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips );
+    void			HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips );
 
-    BOOL            HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes = true );
+    BOOL			HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow );
 
-    void            DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
+    void			DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1,
                                             SCCOL nCol2,SCROW nRow2 );
-    void            DeleteObjectsInSelection( const ScMarkData& rMark );
+    void			DeleteObjectsInSelection( const ScMarkData& rMark );
 
-    void            CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange );
-    void            CopyFromClip( ScDrawLayer* pClipModel,
+    void			CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange );
+    void			CopyFromClip( ScDrawLayer* pClipModel,
                                     SCTAB nSourceTab, const Rectangle& rSourceRange,
                                     const ScAddress& rDestPos, const Rectangle& rDestRange );
 
-    void            SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true );
+    void			SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNoteCaptionPos = true );
 
-                    //  mirror or move between positive and negative positions for RTL
-    void            MirrorRTL( SdrObject* pObj );
-    static void     MirrorRectRTL( Rectangle& rRect );      // for bounding rectangles etc.
+                    //	mirror or move between positive and negative positions for RTL
+    void			MirrorRTL( SdrObject* pObj );
+    static void		MirrorRectRTL( Rectangle& rRect );		// for bounding rectangles etc.
 
     /** Returns the rectangle for the passed cell address in 1/100 mm.
         @param bMergedCell  True = regards merged cells. False = use single column/row size. */
     static Rectangle GetCellRect( ScDocument& rDoc, const ScAddress& rPos, bool bMergedCell );
 
-                    //  GetVisibleName: name for navigator etc: GetPersistName or GetName
-                    //  (ChartListenerCollection etc. must use GetPersistName directly)
-    static String   GetVisibleName( SdrObject* pObj );
+                    //	GetVisibleName: name for navigator etc: GetPersistName or GetName
+                    //	(ChartListenerCollection etc. must use GetPersistName directly)
+    static String	GetVisibleName( SdrObject* pObj );
 
-    SdrObject*      GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const;
+    SdrObject*		GetNamedObject( const String& rName, USHORT nId, SCTAB& rFoundTab ) const;
                     // if pnCounter != NULL, the search for a name starts with this index + 1,
                     // and the index really used is returned.
     String          GetNewGraphicName( long* pnCounter = NULL ) const;
-    void            EnsureGraphicNames();
+    void			EnsureGraphicNames();
 
     // Verankerung setzen und ermitteln
-    static void     SetAnchor( SdrObject*, ScAnchorType );
-    static ScAnchorType GetAnchor( const SdrObject* );
+    static void		SetAnchor( SdrObject*, ScAnchorType );
+    static ScAnchorType	GetAnchor( const SdrObject* );
 
     // Positionen fuer Detektivlinien
     static ScDrawObjData* GetObjData( SdrObject* pObj, BOOL bCreate=FALSE );
@@ -218,9 +218,9 @@ public:
     static ScMacroInfo* GetMacroInfo( SdrObject* pObj, BOOL bCreate = FALSE );
 
 private:
-    static SfxObjectShell* pGlobalDrawPersist;          // fuer AllocModel
+    static SfxObjectShell* pGlobalDrawPersist;			// fuer AllocModel
 public:
-    static void     SetGlobalDrawPersist(SfxObjectShell* pPersist);
+    static void		SetGlobalDrawPersist(SfxObjectShell* pPersist);
 protected:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
 };