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

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index f2334687e4f3..8996e0f62f0c 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -62,9 +62,9 @@
 
 #include <cppuhelper/bootstrap.hxx>
 
-#define HANDLE_ID           0
-#define FIELD_EXPRESSION    1
-#define GROUPS_START_LEN    5
+#define HANDLE_ID			0
+#define FIELD_EXPRESSION	1
+#define GROUPS_START_LEN	5
 #define NO_GROUP            -1
 
 namespace rptui
@@ -100,12 +100,12 @@ class OFieldExpressionControl : public TContainerListenerBase
     ::osl::Mutex                    m_aMutex;
     ::std::vector<sal_Int32>        m_aGroupPositions;
     ::std::vector<ColumnInfo>       m_aColumnInfo;
-    ::svt::ComboBoxControl*         m_pComboCell;
-    sal_Int32                       m_nDataPos;
-    sal_Int32                       m_nCurrentPos;
-    ULONG                           m_nPasteEvent;
-    ULONG                           m_nDeleteEvent;
-    OGroupsSortingDialog*           m_pParent;
+    ::svt::ComboBoxControl*			m_pComboCell;
+    sal_Int32						m_nDataPos;
+    sal_Int32						m_nCurrentPos;
+    ULONG							m_nPasteEvent;
+    ULONG							m_nDeleteEvent;
+    OGroupsSortingDialog*			m_pParent;
     bool                            m_bIgnoreEvent;
 
 
@@ -125,17 +125,17 @@ public:
     virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException);
 
-    void        fillColumns(const uno::Reference< container::XNameAccess>& _xColumns);
-    void        lateInit();
-    sal_Bool    IsDeleteAllowed( );
-    void        DeleteRows();
-    void        cut();
-    void        copy();
-    void        paste();
+    void		fillColumns(const uno::Reference< container::XNameAccess>& _xColumns);
+    void		lateInit();
+    sal_Bool	IsDeleteAllowed( );
+    void		DeleteRows();
+    void		cut();
+    void		copy();
+    void		paste();
 
     inline sal_Int32   getGroupPosition(sal_Int32 _nRow) const { return _nRow != BROWSER_ENDOFSELECTION ? m_aGroupPositions[_nRow] : sal_Int32(NO_GROUP); }
 
-    inline ::svt::ComboBoxControl*  getExpressionControl() const { return m_pComboCell; }
+    inline ::svt::ComboBoxControl*	getExpressionControl() const { return m_pComboCell; }
 
 
     /** returns the sequence with the selected groups
@@ -164,7 +164,7 @@ protected:
     virtual void Command( const CommandEvent& rEvt );
 
     // D&D
-    virtual void     StartDrag( sal_Int8 nAction, const Point& rPosPixel );
+    virtual void	 StartDrag( sal_Int8 nAction, const Point& rPosPixel );
     virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt );
     virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt );
 
@@ -295,7 +295,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE
     sal_Int8 nAction = DND_ACTION_NONE;
     if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) )
     {
-        sal_Int32   nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False);
+        sal_Int32	nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False);
         SetNoSelection();
 
         TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable );
@@ -394,8 +394,8 @@ void OFieldExpressionControl::lateInit()
 
         //////////////////////////////////////////////////////////////////////
         // set browse mode
-        BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION  | BROWSER_KEEPSELECTION |
-                          BROWSER_HLINESFULL | BROWSER_VLINESFULL       | BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL);
+        BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION	| BROWSER_KEEPSELECTION |
+                          BROWSER_HLINESFULL | BROWSER_VLINESFULL		| BROWSER_AUTOSIZE_LASTCOL | BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL);
         if( m_pParent->isReadOnly() )
             nMode |= BROWSER_HIDECURSOR;
         SetMode(nMode);
@@ -634,7 +634,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
     }
     return EditBrowseBox::CLEAN;
 }
-//  XEventListener
+//	XEventListener
 //------------------------------------------------------------------------------
 void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException )
 {
@@ -727,7 +727,7 @@ void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt )
 {
     if (IsDeleteAllowed())
     {
-        if (rEvt.GetKeyCode().GetCode() == KEY_DELETE &&    // Delete rows
+        if (rEvt.GetKeyCode().GetCode() == KEY_DELETE &&	// Delete rows
             !rEvt.GetKeyCode().IsShift() &&
             !rEvt.GetKeyCode().IsMod1())
         {
@@ -1027,7 +1027,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i)
         static_cast<ListBox*>(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl));
 
-    Control* pControls[]    = { &m_aHeader, &m_aFooter, &m_aGroupOn, &m_aGroupInterval, &m_aKeepTogether, &m_aOrder
+    Control* pControls[]	= { &m_aHeader,	&m_aFooter,	&m_aGroupOn, &m_aGroupInterval,	&m_aKeepTogether, &m_aOrder
                                 , &m_aMove,&m_aFL2};
     sal_Int32 nMaxTextWidth = 0;
     MnemonicGenerator aMnemonicGenerator;
@@ -1049,7 +1049,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() + 3*aSpace.Width(),aSpace.Height());
     SetMinOutputSizePixel(aOutSize);
     SetOutputSizePixel(aOutSize);
-//  Resize();
+//	Resize();
 
     m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get());
     m_pReportListener->addProperty(PROPERTY_COMMAND);
@@ -1071,8 +1071,8 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     //BTN m_aPB_Up.SetZOrder(&m_aMove, WINDOW_ZORDER_BEHIND);
     //BTN m_aPB_Down.SetZOrder(&m_aPB_Up, WINDOW_ZORDER_BEHIND);
     // set Hi contrast bitmaps
-    //BTN m_aPB_Up.SetModeImage(        ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST);
-    //BTN m_aPB_Down.SetModeImage(  ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST);
+    //BTN m_aPB_Up.SetModeImage(		ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST);
+    //BTN m_aPB_Down.SetModeImage(	ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST);
     m_aToolBox.SetStyle(m_aToolBox.GetStyle()|WB_LINESPACING);
     m_aToolBox.SetSelectHdl(LINK(this, OGroupsSortingDialog, OnFormatAction));
     m_aToolBox.SetImageListProvider(this);
@@ -1424,7 +1424,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
     for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
         pControls[i]->SaveValue();
 
-    ListBox* pControlsLst2[] = { &m_aHeaderLst, &m_aFooterLst,  &m_aGroupOnLst, &m_aKeepTogetherLst,&m_aOrderLst};
+    ListBox* pControlsLst2[] = { &m_aHeaderLst,	&m_aFooterLst,	&m_aGroupOnLst,	&m_aKeepTogetherLst,&m_aOrderLst};
     sal_Bool bReadOnly = !m_pController->isEditable();
     for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst2); ++i)
         pControlsLst2[i]->SetReadOnly(bReadOnly);
@@ -1438,8 +1438,8 @@ void OGroupsSortingDialog::Resize()
     Size aSpace = LogicToPixel( Size( UNRELATED_CONTROLS, UNRELATED_CONTROLS ), MAP_APPFONT );
     m_pFieldExpression->SetSizePixel(Size(aTotalOutputSize.Width() - 2*aSpace.Width(),m_pFieldExpression->GetSizePixel().Height()));
 
-    Control* pControlsLst[] = { &m_aHeaderLst,  &m_aFooterLst,  &m_aGroupOnLst, &m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst};
-    Control* pControls[]    = { &m_aHeader,     &m_aFooter,     &m_aGroupOn,    &m_aGroupInterval,  &m_aKeepTogether,   &m_aOrder};
+    Control* pControlsLst[] = { &m_aHeaderLst,	&m_aFooterLst,	&m_aGroupOnLst,	&m_aGroupIntervalEd,&m_aKeepTogetherLst,&m_aOrderLst};
+    Control* pControls[]	= { &m_aHeader,		&m_aFooter,		&m_aGroupOn,	&m_aGroupInterval,	&m_aKeepTogether,	&m_aOrder};
     sal_Int32 nMaxTextWidth = 0;
     for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i)
     {
@@ -1461,14 +1461,14 @@ void OGroupsSortingDialog::Resize()
     m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height()));
     m_aFL3.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL3.GetSizePixel().Height()));
 
-//BTN   sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width();
-//BTN   m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y()));
+//BTN 	sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aPB_Up.GetSizePixel().Width();
+//BTN  	m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y()));
 //BTN
-//BTN   nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width());
-//BTN   m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y()));
+//BTN  	nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS, 0 ), MAP_APPFONT ).Width());
+//BTN  	m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y()));
 //BTN
-//BTN   nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width());
-//BTN   m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y()));
+//BTN  	nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0 ), MAP_APPFONT ).Width());
+//BTN  	m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y()));
     sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aToolBox.GetSizePixel().Width();
     m_aToolBox.SetPosPixel(Point(nPos,m_aToolBox.GetPosPixel().Y()));