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

diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index b4ad990afbaf..77c80532129f 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.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
@@ -33,7 +33,7 @@
 #include "rangelst.hxx"
 #include "scdllapi.h"
 
-enum ScChgsDateMode{    SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2,
+enum ScChgsDateMode{	SCDM_DATE_BEFORE=0,SCDM_DATE_SINCE=1,SCDM_DATE_EQUAL=2,
                         SCDM_DATE_NOTEQUAL=3,SCDM_DATE_BETWEEN=4, SCDM_DATE_SAVE=5,
                         SCDM_NO_DATEMODE=6};
 
@@ -47,21 +47,21 @@ class SC_DLLPUBLIC ScChangeViewSettings
 {
 private:
 
-    utl::TextSearch*    pCommentSearcher;
-    DateTime            aFirstDateTime;
-    DateTime            aLastDateTime;
-    String              aAuthorToShow;
-    String              aComment;
-    ScRangeList         aRangeList;
-    ScChgsDateMode      eDateMode;
-    BOOL                bShowIt;
-    BOOL                bIsDate;
-    BOOL                bIsAuthor;
-    BOOL                bIsComment;
-    BOOL                bIsRange;
-    BOOL                bEveryoneButMe;
-    BOOL                bShowAccepted;
-    BOOL                bShowRejected;
+    utl::TextSearch*	pCommentSearcher;
+    DateTime			aFirstDateTime;
+    DateTime			aLastDateTime;
+    String				aAuthorToShow;
+    String				aComment;
+    ScRangeList			aRangeList;
+    ScChgsDateMode 		eDateMode;
+    BOOL				bShowIt;
+    BOOL				bIsDate;
+    BOOL				bIsAuthor;
+    BOOL				bIsComment;
+    BOOL				bIsRange;
+    BOOL				bEveryoneButMe;
+    BOOL				bShowAccepted;
+    BOOL				bShowRejected;
     bool                mbIsActionRange;
     ULONG               mnFirstAction;
     ULONG               mnLastAction;
@@ -87,53 +87,53 @@ public:
 
                         ~ScChangeViewSettings();
 
-    BOOL                ShowChanges() const {return bShowIt;}
-    void                SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;}
+    BOOL				ShowChanges() const {return bShowIt;}
+    void				SetShowChanges(BOOL nFlag=TRUE){bShowIt=nFlag;}
 
-    BOOL                HasDate() const {return bIsDate;}
-    void                SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;}
+    BOOL				HasDate() const {return bIsDate;}
+    void				SetHasDate(BOOL nFlag=TRUE) {bIsDate=nFlag;}
 
-    void                SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; }
-    ScChgsDateMode      GetTheDateMode() const { return eDateMode; }
+    void				SetTheDateMode(ScChgsDateMode eDatMod){ eDateMode=eDatMod; }
+    ScChgsDateMode		GetTheDateMode() const { return eDateMode; }
 
-    void                SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;}
-    const DateTime&     GetTheFirstDateTime()const {return aFirstDateTime;}
+    void				SetTheFirstDateTime(const DateTime& aDateTime) {aFirstDateTime=aDateTime;}
+    const DateTime&		GetTheFirstDateTime()const {return aFirstDateTime;}
 
-    void                SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;}
-    const DateTime&     GetTheLastDateTime()const {return aLastDateTime;}
+    void				SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;}
+    const DateTime&		GetTheLastDateTime()const {return aLastDateTime;}
 
 
-    BOOL                HasAuthor() const {return bIsAuthor;}
-    void                SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;}
+    BOOL				HasAuthor() const {return bIsAuthor;}
+    void				SetHasAuthor(BOOL nFlag=TRUE) {bIsAuthor=nFlag;}
 
-    String              GetTheAuthorToShow()const {return aAuthorToShow;}
-    void                SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;}
+    String				GetTheAuthorToShow()const {return aAuthorToShow;}
+    void				SetTheAuthorToShow(const String& aString){aAuthorToShow=aString;}
 
-    BOOL                HasComment() const {return bIsComment;}
-    void                SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;}
+    BOOL				HasComment() const {return bIsComment;}
+    void				SetHasComment(BOOL nFlag=TRUE) {bIsComment=nFlag;}
 
-    String              GetTheComment()const {return aComment;}
-    void                SetTheComment(const String& aString);
+    String				GetTheComment()const {return aComment;}
+    void				SetTheComment(const String& aString);
 
-    BOOL                IsValidComment(const String* pCommentStr) const;
+    BOOL				IsValidComment(const String* pCommentStr) const;
 
-    BOOL                IsEveryoneButMe() const {return bEveryoneButMe;}
-    void                SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;}
+    BOOL				IsEveryoneButMe() const {return bEveryoneButMe;}
+    void				SetEveryoneButMe(BOOL nFlag=TRUE) {bEveryoneButMe=nFlag;}
 
 
-    BOOL                HasRange() const {return bIsRange;}
-    void                SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;}
+    BOOL				HasRange() const {return bIsRange;}
+    void				SetHasRange(BOOL nFlag=TRUE) {bIsRange=nFlag;}
 
-    const ScRangeList&  GetTheRangeList()const {return aRangeList;}
-    void                SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;}
+    const ScRangeList&	GetTheRangeList()const {return aRangeList;}
+    void 				SetTheRangeList(const ScRangeList& aRl){aRangeList=aRl;}
 
-    BOOL                IsShowAccepted() const { return bShowAccepted; }
-    void                SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; }
+    BOOL				IsShowAccepted() const { return bShowAccepted; }
+    void				SetShowAccepted( BOOL bVal ) { bShowAccepted = bVal; }
 
-    BOOL                IsShowRejected() const { return bShowRejected; }
-    void                SetShowRejected( BOOL bVal ) { bShowRejected = bVal; }
+    BOOL				IsShowRejected() const { return bShowRejected; }
+    void				SetShowRejected( BOOL bVal ) { bShowRejected = bVal; }
 
-    ScChangeViewSettings&   operator=   ( const ScChangeViewSettings& r );
+    ScChangeViewSettings&	operator=	( const ScChangeViewSettings& r );
 
                         /// Adjust dates according to selected DateMode
     void                AdjustDateMode( const ScDocument& rDoc );