recreated tag libreoffice-3.3.0.4 which had these commits:

commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 18 19:01:14 2011 +0100

Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)

commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date:   Sat Jan 15 05:39:40 2011 +0100

i#116187: report left/right page margin setting ignored on Unix 64 bit

(cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a)
Signed-off-by: Michael Meeks <michael.meeks@novell.com>

reportdesign/source/ui/report/ReportController.cxx |    4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

commit ae3903b548d8d05807cc7f3a029495388de5e302
Author: Kohei Yoshida <kyoshida@novell.com>
Date:   Fri Jan 14 11:24:43 2011 -0500

Remove the Registration... menu item which we don't want. (fdo#33112)

dbaccess/uiconfig/dbtdata/menubar/menubar.xml |    1 -
1 files changed, 0 insertions(+), 1 deletions(-)

commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd
Author: Noel Power <noel.power@novell.com>
Date:   Wed Jan 12 11:09:51 2011 +0000

fix for fdo#32742#

reportdesign/source/ui/inspection/metadata.cxx |    2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

commit 66d25b635de422a4a811710cb3289266d9a11a84
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 11 22:59:35 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, 30 insertions, 30 deletions

diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 4c119ca15c78..04018dec54d0 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.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
@@ -48,8 +48,8 @@ const long HIT_SENSITIVE_RADIUS = 5;
 namespace
 {
     /** calcRect creates a new rectangle with the given points
-            @param  _rBase      the base point
-            @param  _aVector    the vector which will be added
+            @param	_rBase		the base point
+            @param	_aVector	the vector which will be added
     */
     inline Rectangle calcRect(const Point& _rBase,const Point& _aVector)
     {
@@ -57,9 +57,9 @@ namespace
     }
     // -----------------------------------------------------------------------------
     /** GetTextPos calculate the rectangle for the connection to be drawn
-            @param  _pWin           the table window where to draw it
-            @param  _aConnPos       the connection point
-            @param  _aDescrLinePos  the description line pos
+            @param	_pWin			the table window where to draw it
+            @param	_aConnPos		the connection point
+            @param	_aDescrLinePos	the description line pos
     */
     Rectangle GetTextPos(const OTableWindow* _pWin, const Point& _aConnPos,const Point& _aDescrLinePos)
     {
@@ -88,10 +88,10 @@ namespace
     }
     // -----------------------------------------------------------------------------
     /** calcPointsYValue calculate the points Y value in relation to the listbox entry
-            @param  _pWin           the corresponding window
-            @param  _pEntry         the source or dest entry
-            @param  _rNewConPos     (in/out) the connection pos
-            @param  _rNewDescrPos   (in/out) the description pos
+            @param	_pWin			the corresponding window
+            @param	_pEntry			the source or dest entry
+            @param	_rNewConPos		(in/out) the connection pos
+            @param	_rNewDescrPos	(in/out) the description pos
     */
     void calcPointsYValue(const OTableWindow* _pWin,SvLBoxEntry* _pEntry,Point& _rNewConPos,Point& _rNewDescrPos)
     {
@@ -254,20 +254,20 @@ BOOL OConnectionLine::RecalcLine()
     aSourceCenter.X() = pSourceWin->GetPosPixel().X() + (long)( 0.5*pSourceWin->GetSizePixel().Width() );
     aDestCenter.X() = pDestWin->GetPosPixel().X() + (long)( 0.5*pDestWin->GetSizePixel().Width() );
 
-    const OTableWindow* pFirstWin   = pDestWin;
-    const OTableWindow* pSecondWin  = pSourceWin;
-    Point* pFirstConPos             = &m_aDestConnPos;
-    Point* pFirstDescrPos           = &m_aDestDescrLinePos;
-    Point* pSecondConPos            = &m_aSourceConnPos;
-    Point* pSecondDescrPos          = &m_aSourceDescrLinePos;
+    const OTableWindow* pFirstWin	= pDestWin;
+    const OTableWindow* pSecondWin	= pSourceWin;
+    Point* pFirstConPos				= &m_aDestConnPos;
+    Point* pFirstDescrPos			= &m_aDestDescrLinePos;
+    Point* pSecondConPos			= &m_aSourceConnPos;
+    Point* pSecondDescrPos			= &m_aSourceDescrLinePos;
     if( aDestCenter.X() > aSourceCenter.X() )
     {
-        pFirstWin       = pSourceWin;
-        pSecondWin      = pDestWin;
-        pFirstConPos    = &m_aSourceConnPos;
-        pFirstDescrPos  = &m_aSourceDescrLinePos;
-        pSecondConPos   = &m_aDestConnPos;
-        pSecondDescrPos = &m_aDestDescrLinePos;
+        pFirstWin		= pSourceWin;
+        pSecondWin		= pDestWin;
+        pFirstConPos	= &m_aSourceConnPos;
+        pFirstDescrPos	= &m_aSourceDescrLinePos;
+        pSecondConPos	= &m_aDestConnPos;
+        pSecondDescrPos	= &m_aDestDescrLinePos;
     }
 
     if ( pFirstWin == pSecondWin && pSourceEntry != pDestEntry )
@@ -279,7 +279,7 @@ BOOL OConnectionLine::RecalcLine()
     //////////////////////////////////////////////////////////////////////
     // aSourceConnPosY bestimmen
     calcPointsYValue(pSourceWin,pSourceEntry,m_aSourceConnPos,m_aSourceDescrLinePos);
-
+    
     //////////////////////////////////////////////////////////////////////
     // aDestConnPosY bestimmen
     calcPointsYValue(pDestWin,pDestEntry,m_aDestConnPos,m_aDestDescrLinePos);
@@ -337,7 +337,7 @@ double dist_Euklid(const Point &p1, const Point& p2,const Point& pM, Point& q)
     double l = (v.X() * w.Y() - v.Y() * w.X()) / a;
     double a2 = w.X()*v.X()+w.Y()*v.Y();
     a = a2 / (a * a);
-    q.X() = long(p1.X() + a * v.X());
+    q.X() = long(p1.X() + a * v.X()); 
     q.Y() = long(p1.Y() + a * v.Y());
     return l;
 }
@@ -361,14 +361,14 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const
     return false;
 }
 // -----------------------------------------------------------------------------
-Rectangle OConnectionLine::GetSourceTextPos() const
-{
-    return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos);
+Rectangle OConnectionLine::GetSourceTextPos() const 
+{ 
+    return GetTextPos(m_pTabConn->GetSourceWin(),m_aSourceConnPos,m_aSourceDescrLinePos); 
 }
 // -----------------------------------------------------------------------------
-Rectangle OConnectionLine::GetDestTextPos() const
-{
-    return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos);
+Rectangle OConnectionLine::GetDestTextPos() const 
+{ 
+    return GetTextPos(m_pTabConn->GetDestWin(),m_aDestConnPos,m_aDestDescrLinePos); 
 }
 // -----------------------------------------------------------------------------
 Point OConnectionLine::getMidPoint() const