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

diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index 07b494dce2af..e89deb8e0d62 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.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
@@ -70,44 +70,44 @@ typedef std::vector< com::sun::star::uno::Reference < com::sun::star::drawing::X
 
 class ScXMLExport : public SvXMLExport
 {
-    ScDocument*                 pDoc;
+    ScDocument*					pDoc;
     com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable;
     com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange;
 
     com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream;
     sal_Int32                   nSourceStreamPos;
 
-    UniReference < XMLPropertyHandlerFactory >  xScPropHdlFactory;
-    UniReference < XMLPropertySetMapper >       xCellStylesPropertySetMapper;
-    UniReference < XMLPropertySetMapper >       xColumnStylesPropertySetMapper;
-    UniReference < XMLPropertySetMapper >       xRowStylesPropertySetMapper;
-    UniReference < XMLPropertySetMapper >       xTableStylesPropertySetMapper;
-    UniReference < SvXMLExportPropertyMapper >  xCellStylesExportPropertySetMapper;
-    UniReference < SvXMLExportPropertyMapper >  xColumnStylesExportPropertySetMapper;
-    UniReference < SvXMLExportPropertyMapper >  xRowStylesExportPropertySetMapper;
-    UniReference < SvXMLExportPropertyMapper >  xTableStylesExportPropertySetMapper;
+    UniReference < XMLPropertyHandlerFactory >	xScPropHdlFactory;
+    UniReference < XMLPropertySetMapper >		xCellStylesPropertySetMapper;
+    UniReference < XMLPropertySetMapper >		xColumnStylesPropertySetMapper;
+    UniReference < XMLPropertySetMapper >		xRowStylesPropertySetMapper;
+    UniReference < XMLPropertySetMapper >		xTableStylesPropertySetMapper;
+    UniReference < SvXMLExportPropertyMapper >	xCellStylesExportPropertySetMapper;
+    UniReference < SvXMLExportPropertyMapper >	xColumnStylesExportPropertySetMapper;
+    UniReference < SvXMLExportPropertyMapper >	xRowStylesExportPropertySetMapper;
+    UniReference < SvXMLExportPropertyMapper >	xTableStylesExportPropertySetMapper;
     XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper;
     typedef ::std::hash_map<sal_Int32, sal_Int32>  NumberFormatIndexMap;
     NumberFormatIndexMap                aNumFmtIndexMap;
-    ScMySharedData*                     pSharedData;
-    ScColumnStyles*                 pColumnStyles;
-    ScRowStyles*                    pRowStyles;
-    ScFormatRangeStyles*                pCellStyles;
-    ScRowFormatRanges*                  pRowFormatRanges;
-    std::vector<rtl::OUString>          aTableStyles;
-    com::sun::star::table::CellRangeAddress aRowHeaderRange;
-    ScMyOpenCloseColumnRowGroup*        pGroupColumns;
-    ScMyOpenCloseColumnRowGroup*        pGroupRows;
-    ScMyDefaultStyles*                  pDefaults;
-    ScChartListener*                    pChartListener;
+    ScMySharedData*						pSharedData;
+    ScColumnStyles*					pColumnStyles;
+    ScRowStyles*					pRowStyles;
+    ScFormatRangeStyles*				pCellStyles;
+    ScRowFormatRanges*					pRowFormatRanges;
+    std::vector<rtl::OUString>			aTableStyles;
+    com::sun::star::table::CellRangeAddress	aRowHeaderRange;
+    ScMyOpenCloseColumnRowGroup*		pGroupColumns;
+    ScMyOpenCloseColumnRowGroup*		pGroupRows;
+    ScMyDefaultStyles*					pDefaults;
+    ScChartListener*					pChartListener;
     const ScMyCell*                     pCurrentCell;
 
-    ScMyMergedRangesContainer*  pMergedRangesContainer;
-    ScMyValidationsContainer*   pValidationsContainer;
-    ScMyNotEmptyCellsIterator*  pCellsItr;
-    ScChangeTrackingExportHelper*   pChangeTrackingExportHelper;
-    const rtl::OUString         sLayerID;
-    const rtl::OUString         sCaptionShape;
+    ScMyMergedRangesContainer*	pMergedRangesContainer;
+    ScMyValidationsContainer*	pValidationsContainer;
+    ScMyNotEmptyCellsIterator*	pCellsItr;
+    ScChangeTrackingExportHelper*	pChangeTrackingExportHelper;
+    const rtl::OUString			sLayerID;
+    const rtl::OUString			sCaptionShape;
     rtl::OUString               sExternalRefTabStyleName;
     rtl::OUString               sAttrName;
     rtl::OUString               sAttrStyleName;
@@ -121,19 +121,19 @@ class ScXMLExport : public SvXMLExport
     rtl::OUString               sElemRow;
     rtl::OUString               sElemTab;
     rtl::OUString               sElemP;
-    sal_Int32                   nOpenRow;
+    sal_Int32					nOpenRow;
     sal_Int32                   nProgressCount;
-    sal_uInt16                  nCurrentTable;
-    sal_Bool                    bHasRowHeader;
-    sal_Bool                    bRowHeaderOpen;
-    sal_Bool                    mbShowProgress;
+    sal_uInt16					nCurrentTable;
+    sal_Bool					bHasRowHeader;
+    sal_Bool					bRowHeaderOpen;
+    sal_Bool					mbShowProgress;
 
     sal_Int32       GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const;
-    sal_Bool        HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc);
-    void            CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount);
-    void            CollectShapesAutoStyles(const sal_Int32 nTableCount);
-    void            WriteTablesView(const com::sun::star::uno::Any& aTableView);
-    void            WriteView(const com::sun::star::uno::Any& aView);
+    sal_Bool		HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc);
+    void			CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount);
+    void			CollectShapesAutoStyles(const sal_Int32 nTableCount);
+    void			WriteTablesView(const com::sun::star::uno::Any& aTableView);
+    void			WriteView(const com::sun::star::uno::Any& aView);
     virtual void _ExportFontDecls();
     virtual void _ExportStyles( sal_Bool bUsed );
     virtual void _ExportAutoStyles();
@@ -146,7 +146,7 @@ class ScXMLExport : public SvXMLExport
 
     com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable,
                                                         const sal_Int32 nTable);
-//  ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges();
+//	ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges();
     void GetAreaLinks( com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc, ScMyAreaLinksContainer& rAreaLinks );
     void GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp );
     void WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex,
@@ -196,12 +196,12 @@ class ScXMLExport : public SvXMLExport
 
     void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc);
     void WriteTableSource();
-    void WriteScenario();   // core implementation
+    void WriteScenario();	// core implementation
     void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc);
     void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn );
     void WriteNamedExpressions(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc);
     void WriteExternalRefCaches();
-    void WriteConsolidation();  // core implementation
+    void WriteConsolidation();	// core implementation
 
     void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib);
 
@@ -234,8 +234,8 @@ public:
     virtual ~ScXMLExport();
 
     static sal_Int16 GetFieldUnit();
-    inline ScDocument*          GetDocument()           { return pDoc; }
-    inline const ScDocument*    GetDocument() const     { return pDoc; }
+    inline ScDocument*			GetDocument()			{ return pDoc; }
+    inline const ScDocument*	GetDocument() const		{ return pDoc; }
     sal_Bool IsMatrix (const ScAddress& aCell,
         com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const;