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

diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 4aad2d46f186..f8d5e474382b 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -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
@@ -605,7 +605,7 @@ const tMakeStringStringMap& lcl_getChartTypeNameMap()
 
         ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart2.BubbleChartType" ) )
         , rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.BubbleDiagram" ) ) )
-
+        
         ;
     return g_aChartTypeNameMap;
 }
@@ -751,7 +751,7 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
     if( xProp.is() )
     {
         awt::Size aPageSize( m_spChart2ModelContact->GetPageSize() );
-
+        
         chart2::RelativePosition aRelativePosition;
         aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT;
         aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width);
@@ -1162,7 +1162,7 @@ void SAL_CALL DiagramWrapper::dispose()
 
     // /--
     MutexGuard aGuard( GetMutex());
-
+    
     DisposeHelper::DisposeAndClear( m_xXAxisTitle );
     DisposeHelper::DisposeAndClear( m_xYAxisTitle );
     DisposeHelper::DisposeAndClear( m_xZAxisTitle );
@@ -1390,7 +1390,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re
 
     StackMode eInnerStackMode;
     bool bHasDetectableInnerValue = detectInnerValue( eInnerStackMode );
-
+    
     if( !bHasDetectableInnerValue )
     {
         m_aOuterValue = rOuterValue;
@@ -1401,7 +1401,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re
         return;
     if( !bNewValue && eInnerStackMode != m_eStackMode )
         return;
-
+    
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     if( xDiagram.is() )
     {
@@ -1789,8 +1789,8 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal
     uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue;
     if( ! (rOuterValue >>= aNewValue) )
         throw lang::IllegalArgumentException( C2U("Property AttributedDataPoints requires value of type uno::Sequence< uno::Sequence< sal_Int32 > >"), 0, 0 );
-
-    m_aOuterValue = rOuterValue;
+    
+    m_aOuterValue = rOuterValue;    
 
     Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
     Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY );
@@ -1812,7 +1812,7 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal
             {
                 uno::Any aVal;
                 if( i < aNewValue.getLength() )
-                    aVal <<= aNewValue[i];
+                    aVal <<= aNewValue[i];  
                 else
                 {
                     //set empty sequence
@@ -1984,7 +1984,7 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con
             throw lang::IllegalArgumentException( C2U("Property AutomaticSize requires value of type boolean"), 0, 0 );
 
         try
-        {
+        { 
             if( bNewValue )
             {
                 Any aRelativeSize( xInnerPropertySet->getPropertyValue( C2U( "RelativeSize" ) ) );
@@ -2092,7 +2092,7 @@ const Sequence< beans::Property >& DiagramWrapper::getPropertySequence()
 const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
 {
     ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
-
+    
     WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedAxisLabelExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
@@ -2105,7 +2105,7 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
     WrappedSplineProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedStockProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
     WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties );
-
+    
     aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) );
     aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED,m_spChart2ModelContact ) );
     aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED_PERCENT, m_spChart2ModelContact ) );