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, 28 insertions, 30 deletions

diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 2271751a9e48..554611b4dcae 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.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
@@ -92,15 +92,13 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
             }
             else
             {
-                // #i111531# with 1M rows it was necessary to limit the range
+                // #i111531# with 1M rows it was necessary to limit the range 
                 // to the actually used data area.
                 SCCOL nCol1, nCol2;
                 SCROW nRow1, nRow2;
                 SCTAB nTab1, nTab2;
                 aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-                bool bShrunk;
-                pDoc->ShrinkToUsedDataArea( bShrunk, nTab1, nCol1, nRow1, nCol2, nRow2, false);
-                if (bShrunk)
+                if (pDoc->ShrinkToUsedDataArea( nTab1, nCol1, nRow1, nCol2, nRow2, false))
                 {
                     aRange.aStart.SetCol( nCol1 );
                     aRange.aStart.SetRow( nRow1 );
@@ -117,10 +115,10 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord )
 
             aStrSelection.ConvertLineEnd( LINEEND_CR );
 
-            //  Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt,
-            //  oder wenn es eine einzelne Zeile ist.
-            //  Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText).
-            //  Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt.
+            //	Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt,
+            //	oder wenn es eine einzelne Zeile ist.
+            //	Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText).
+            //	Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt.
 
             if ( bInFormatDialog || bWholeWord || aRange.aEnd.Row() == aRange.aStart.Row() )
             {
@@ -144,22 +142,22 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S
                                 USHORT nMode )
 {
     SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode;
-    BOOL bAsText = ( eMode != HLINK_BUTTON );       // Default ist jetzt Text
+    BOOL bAsText = ( eMode != HLINK_BUTTON );		// Default ist jetzt Text
 
     if ( bAsText )
     {
         if ( GetViewData()->IsActive() )
         {
-            //  if the view is active, always use InsertURLField, which starts EditMode
-            //  and selects the URL, so it can be changed from the URL bar / dialog
+            //	if the view is active, always use InsertURLField, which starts EditMode
+            //	and selects the URL, so it can be changed from the URL bar / dialog
 
             InsertURLField( rName, rURL, rTarget );
         }
         else
         {
-            //  #91216# if the view is not active, InsertURLField doesn't work
-            //  -> use InsertBookmark to directly manipulate cell content
-            //  bTryReplace=TRUE -> if cell contains only one URL, replace it
+            //	#91216# if the view is not active, InsertURLField doesn't work
+            //	-> use InsertBookmark to directly manipulate cell content
+            //	bTryReplace=TRUE -> if cell contains only one URL, replace it
 
             SCCOL nPosX = GetViewData()->GetCurX();
             SCROW nPosY = GetViewData()->GetCurY();
@@ -182,7 +180,7 @@ void lcl_SelectFieldAfterInsert( EditView& rView )
     ESelection aSel = rView.GetSelection();
     if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 )
     {
-        //  Cursor is behind the inserted field -> extend selection to the left
+        //	Cursor is behind the inserted field -> extend selection to the left
 
         --aSel.nStartPos;
         rView.SetSelection( aSel );
@@ -195,9 +193,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
     aURLField.SetTargetFrame( rTarget );
     SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD );
 
-    ScViewData*     pViewData   = GetViewData();
-    ScModule*       pScMod      = SC_MOD();
-    ScInputHandler* pHdl        = pScMod->GetInputHdl( pViewData->GetViewShell() );
+    ScViewData*		pViewData	= GetViewData();
+    ScModule*		pScMod		= SC_MOD();
+    ScInputHandler*	pHdl		= pScMod->GetInputHdl( pViewData->GetViewShell() );
 
     BOOL bSelectFirst = FALSE;
     if ( !pScMod->IsEditMode() )
@@ -214,8 +212,8 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
         pScMod->SetInputMode( SC_INPUT_TABLE );
     }
 
-    EditView*       pTopView    = pHdl->GetTopView();
-    EditView*       pTableView  = pHdl->GetTableView();
+    EditView*		pTopView	= pHdl->GetTopView();
+    EditView*		pTableView	= pHdl->GetTableView();
     DBG_ASSERT( pTopView || pTableView, "No EditView" );
 
     if ( bSelectFirst )
@@ -244,9 +242,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co
 
 void ScTabViewShell::ExecSearch( SfxRequest& rReq )
 {
-    const SfxItemSet*   pReqArgs    = rReq.GetArgs();
-    USHORT              nSlot       = rReq.GetSlot();
-    const SfxPoolItem*  pItem;
+    const SfxItemSet*	pReqArgs	= rReq.GetArgs();
+    USHORT				nSlot		= rReq.GetSlot();
+    const SfxPoolItem*	pItem;
 
     switch ( nSlot )
     {
@@ -269,7 +267,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
             if (pReqArgs && SFX_ITEM_SET ==
                             pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem))
             {
-                //  Search-Item merken
+                //	Search-Item merken
                 DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" );
                 ScGlobal::SetSearchItem( *(const SvxSearchItem*) pItem );
             }
@@ -285,11 +283,11 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
             {
                 if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, FALSE, &pItem))
                 {
-                    //  SearchItem holen
+                    //	SearchItem holen
 
                     SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
 
-                    //  SearchItem fuellen
+                    //	SearchItem fuellen
 
                     aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue());
                     if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, FALSE, &pItem))
@@ -304,7 +302,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                     else
                         aSearchItem.SetCommand(SVX_SEARCHCMD_FIND_ALL);
 
-                    //  Request ausfuehren (dabei wird das SearchItem gespeichert)
+                    //	Request ausfuehren (dabei wird das SearchItem gespeichert)
 
                     aSearchItem.SetWhich(SID_SEARCH_ITEM);
                     GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW,
@@ -321,7 +319,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
             break;
         case FID_REPEAT_SEARCH:
             {
-                //  nochmal mit ScGlobal::GetSearchItem()
+                //	nochmal mit ScGlobal::GetSearchItem()
 
                 SvxSearchItem aSearchItem = ScGlobal::GetSearchItem();
                 aSearchItem.SetWhich(SID_SEARCH_ITEM);
@@ -331,7 +329,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
                         &aSearchItem, 0L );
             }
             break;
-//      case FID_SEARCH_COUNT:
+//		case FID_SEARCH_COUNT:
     }
 }