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

diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index c9dfa06cc3b6..00154cfa89f0 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.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
@@ -68,32 +68,32 @@ public:
             ~ScEditWindow();
 
     using Control::SetFont;
-    void            SetFont( const ScPatternAttr& rPattern );
+    void 			SetFont( const ScPatternAttr& rPattern );
     using Control::SetText;
-    void            SetText( const EditTextObject& rTextObject );
-    EditTextObject* CreateTextObject();
-    void            SetCharAttriutes();
+    void 			SetText( const EditTextObject& rTextObject );
+    EditTextObject*	CreateTextObject();
+    void			SetCharAttriutes();
 
-    void            InsertField( const SvxFieldItem& rFld );
+    void			InsertField( const SvxFieldItem& rFld );
 
-    void            SetNumType(SvxNumType eNumType);
+    void			SetNumType(SvxNumType eNumType);
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
     inline ScHeaderEditEngine*  GetEditEngine() const {return pEdEngine;}
 protected:
-    virtual void    Paint( const Rectangle& rRec );
-    virtual void    MouseMove( const MouseEvent& rMEvt );
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt );
-    virtual void    KeyInput( const KeyEvent& rKEvt );
-    virtual void    Command( const CommandEvent& rCEvt );
-    virtual void    GetFocus();
+    virtual void	Paint( const Rectangle& rRec );
+    virtual void	MouseMove( const MouseEvent& rMEvt );
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt );
+    virtual void	KeyInput( const KeyEvent& rKEvt );
+    virtual void	Command( const CommandEvent& rCEvt );
+    virtual void	GetFocus();
     virtual void    LoseFocus();
 
 private:
-    ScHeaderEditEngine* pEdEngine;
-    EditView*           pEdView;
+    ScHeaderEditEngine*	pEdEngine;
+    EditView*			pEdView;
     ScEditWindowLocation eLocation;
     bool mbRTL;
 
@@ -106,33 +106,33 @@ class SC_DLLPUBLIC ScExtIButton : public ImageButton
 {
 private:
 
-    Timer           aTimer;
-    ScPopupMenu*    pPopupMenu;
-    Link            aMLink;
-    USHORT          nSelected;
+    Timer			aTimer;
+    ScPopupMenu*	pPopupMenu;
+    Link			aMLink;
+    USHORT			nSelected;
 
     SC_DLLPRIVATE  DECL_LINK( TimerHdl, Timer*);
 
 protected:
 
-    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
-    virtual void    MouseButtonUp( const MouseEvent& rMEvt);
-    virtual void    Click();
+    virtual void	MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void	MouseButtonUp( const MouseEvent& rMEvt);
+    virtual void	Click();
 
-    virtual void    StartPopup();
+    virtual void	StartPopup();
 
 public:
 
     ScExtIButton(Window* pParent, const ResId& rResId );
 
-    void            SetPopupMenu(ScPopupMenu* pPopUp);
+    void			SetPopupMenu(ScPopupMenu* pPopUp);
 
-    USHORT          GetSelected();
+    USHORT			GetSelected();
 
     void            SetMenuHdl( const Link& rLink ) { aMLink = rLink; }
     const Link&     GetMenuHdl() const { return aMLink; }
 
-    virtual long    PreNotify( NotifyEvent& rNEvt );
+    virtual long	PreNotify( NotifyEvent& rNEvt );
 };
 
 #endif // SC_TPHFEDIT_HXX