recreated tag libreoffice-3.3.1.1 which had these commits:

commit 8964ceb596c66db5e9677de1ad99f9747342b87b (tag: refs/tags/libreoffice-3.3.1.1)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Feb 8 18:07:42 2011 +0100

Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1)

commit 737b6a92adca9a8285370918671b93b56a028537
Author: Jan Holesovsky <kendy@suse.cz>
Date:   Mon Feb 7 21:23:21 2011 +0100

Branch libreoffice-3-3-1

This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 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.

commit d4d6a678bf169eebee2fe4d71c8ec66de6898d6e
Author: Jani Monoses <jani.monoses@canonical.com>
Date:   Thu Jan 27 15:33:06 2011 +0200

Remove unused declaration

Signed-off-by: Michael Meeks <michael.meeks@novell.com>

sc/source/core/tool/token.cxx |    3 ---
1 files changed, 0 insertions(+), 3 deletions(-)

commit 96bee1507119ca0525845022019d90f0694996aa
Author: Kohei Yoshida <kyoshida@novell.com>
Date:   Thu Jan 20 23:44:52 2011 -0500

Fixed incorrect page number in page preview mode. (fdo#33155)

When the window is large enough to show several 'Page X' strings,
the page number was not properly incremented.  This commit fixes
it.

sc/source/ui/view/gridwin4.cxx |   12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)

commit ed46df1fcb5869818f5f74e0c7a5b19c65102e83
Author: Kohei Yoshida <kyoshida@novell.com>
Date:   Wed Jan 19 00:24:24 2011 -0500

Fixed incorrect import of cell attributes from Excel documents.

When a cell with non-default formatting attribute starts with non-first
row in a column, the filter would incorrectly apply the same format to
all the cells above it if they didn't have any formats.  This commit
fixes it.

sc/source/filter/excel/xistyle.cxx |    9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)

commit af63319fcdeea3f9b5018eab83ef5a9e64905446
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 5ada5635cff38af87830b091b36159cf80e4cf5d
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 c900e3db767518b7a60eaf24bdf298c94315f685
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 11 23:05:56 2011 +0100

Please, ignore the previous message; it was for the libreoffice-3-3-0 branch

This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
Only safe changes, reviewed by anoter person are allowed.

If you want to build something cool, unstable, and risky, use master.

commit 15d298ba7c4e89b043b3077e17747ba027a62c43
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue Jan 11 22:39:06 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, 106 insertions, 106 deletions

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 57d0fd43f179..e880df8b5402 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.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
@@ -90,24 +90,24 @@ public:
 class AbstractScDataPilotDatabaseDlg  :public VclAbstractDialog  //add for ScDataPilotDatabaseDlg
 {
 public:
-    virtual void    GetValues( ScImportSourceDesc& rDesc ) = 0;
+    virtual void	GetValues( ScImportSourceDesc& rDesc ) = 0;
 };
 
 class AbstractScDataPilotSourceTypeDlg  : public VclAbstractDialog  //add for ScDataPilotSourceTypeDlg
 {
 public:
-    virtual BOOL    IsDatabase() const = 0;
-    virtual BOOL    IsExternal() const = 0;
+    virtual BOOL	IsDatabase() const = 0;
+    virtual BOOL	IsExternal() const = 0;
 };
 
 class AbstractScDataPilotServiceDlg : public VclAbstractDialog  //add for ScDataPilotServiceDlg
 {
 public:
-    virtual String  GetServiceName() const = 0;
-    virtual String  GetParSource() const = 0 ;
-    virtual String  GetParName() const = 0 ;
-    virtual String  GetParUser() const = 0;
-    virtual String  GetParPass() const = 0;
+    virtual String	GetServiceName() const = 0;
+    virtual String	GetParSource() const = 0 ;
+    virtual String	GetParName() const = 0 ;
+    virtual String	GetParUser() const = 0;
+    virtual String	GetParPass() const = 0;
 };
 
 class AbstractScDeleteCellDlg : public VclAbstractDialog  //add for ScDeleteCellDlg
@@ -125,21 +125,21 @@ class AbstractScDataFormDlg : public VclAbstractDialog  //add for ScDeleteCellDl
 class AbstractScDeleteContentsDlg: public VclAbstractDialog  //add for ScDeleteContentsDlg
 {
 public:
-    virtual void    DisableObjects() = 0 ;
-    virtual USHORT  GetDelContentsCmdBits() const = 0;
+    virtual void	DisableObjects() = 0 ;
+    virtual USHORT	GetDelContentsCmdBits() const = 0;
 };
 
 class AbstractScFillSeriesDlg: public VclAbstractDialog  //add for ScFillSeriesDlg
 {
 public:
-    virtual FillDir     GetFillDir() const = 0;
-    virtual FillCmd     GetFillCmd() const = 0;
-    virtual FillDateCmd GetFillDateCmd() const = 0;
-    virtual double      GetStart() const = 0;
-    virtual double      GetStep() const = 0;
-    virtual double      GetMax() const = 0;
-    virtual String      GetStartStr() const = 0;
-    virtual void        SetEdStartValEnabled(BOOL bFlag=FALSE) = 0;
+    virtual FillDir		GetFillDir() const = 0;
+    virtual FillCmd		GetFillCmd() const = 0;
+    virtual FillDateCmd	GetFillDateCmd() const = 0;
+    virtual double		GetStart() const = 0;
+    virtual double		GetStep() const	= 0;
+    virtual double		GetMax() const = 0;
+    virtual String		GetStartStr() const = 0;
+    virtual void		SetEdStartValEnabled(BOOL bFlag=FALSE) = 0;
 };
 
 class AbstractScGroupDlg :  public VclAbstractDialog  //add for ScGroupDlg
@@ -157,28 +157,28 @@ public:
 class AbstractScInsertContentsDlg : public VclAbstractDialog  //add for ScInsertContentsDlg
 {
 public:
-    virtual USHORT      GetInsContentsCmdBits() const = 0;
-    virtual USHORT      GetFormulaCmdBits() const = 0 ;
-    virtual BOOL        IsSkipEmptyCells() const = 0;
-    virtual BOOL        IsLink() const = 0;
-    virtual void    SetFillMode( BOOL bSet ) = 0;
-    virtual void    SetOtherDoc( BOOL bSet ) = 0;
-    virtual BOOL        IsTranspose() const = 0;
-    virtual void    SetChangeTrack( BOOL bSet ) = 0;
-    virtual void    SetCellShiftDisabled( int nDisable ) = 0;
-    virtual InsCellCmd  GetMoveMode() = 0;
+    virtual USHORT		GetInsContentsCmdBits() const = 0;
+    virtual USHORT		GetFormulaCmdBits() const = 0 ;
+    virtual BOOL		IsSkipEmptyCells() const = 0;
+    virtual BOOL 		IsLink() const = 0;
+    virtual void	SetFillMode( BOOL bSet ) = 0;
+    virtual void	SetOtherDoc( BOOL bSet ) = 0;
+    virtual BOOL 		IsTranspose() const = 0;
+    virtual void	SetChangeTrack( BOOL bSet ) = 0;
+    virtual void	SetCellShiftDisabled( int nDisable ) = 0;
+    virtual InsCellCmd	GetMoveMode() = 0;
 };
 
 class AbstractScInsertTableDlg : public VclAbstractDialog  //add for ScInsertTableDlg
 {
 public:
-    virtual BOOL            GetTablesFromFile() = 0;
-    virtual BOOL            GetTablesAsLink()   = 0;
-    virtual const String*   GetFirstTable( USHORT* pN = NULL ) = 0;
-    virtual ScDocShell*     GetDocShellTables() = 0;
-    virtual BOOL            IsTableBefore() = 0;
-    virtual USHORT          GetTableCount() = 0;
-    virtual const String*   GetNextTable( USHORT* pN = NULL ) = 0;
+    virtual BOOL			GetTablesFromFile()	= 0;
+    virtual BOOL			GetTablesAsLink()	= 0;
+    virtual const String*	GetFirstTable( USHORT* pN = NULL ) = 0;
+    virtual ScDocShell*		GetDocShellTables()	= 0;
+    virtual BOOL			IsTableBefore() = 0;
+    virtual USHORT			GetTableCount() = 0;
+    virtual const String*	GetNextTable( USHORT* pN = NULL ) = 0;
 
 };
 
@@ -191,14 +191,14 @@ public:
 class AbstractScLinkedAreaDlg : public VclAbstractDialog2  //add for ScLinkedAreaDlg
 {
 public:
-    virtual void            InitFromOldLink( const String& rFile, const String& rFilter,
+    virtual void			InitFromOldLink( const String& rFile, const String& rFilter,
                                         const String& rOptions, const String& rSource,
                                         ULONG nRefresh ) = 0;
-    virtual String          GetURL() = 0;
-    virtual String          GetFilter() = 0;        // may be empty
-    virtual String          GetOptions() = 0;       // filter options
-    virtual String          GetSource() = 0;        // separated by ";"
-    virtual ULONG           GetRefresh() = 0;       // 0 if disabled
+    virtual String			GetURL() = 0;
+    virtual String			GetFilter() = 0;		// may be empty
+    virtual String			GetOptions() = 0;		// filter options
+    virtual String			GetSource() = 0;		// separated by ";"
+    virtual ULONG			GetRefresh() = 0;		// 0 if disabled
 };
 
 class AbstractScMetricInputDlg : public VclAbstractDialog  //add for ScMetricInputDlg
@@ -210,29 +210,29 @@ public:
 class AbstractScMoveTableDlg : public VclAbstractDialog  //add for ScMoveTableDlg
 {
 public:
-    virtual USHORT  GetSelectedDocument     () const = 0;
-    virtual USHORT  GetSelectedTable        () const = 0;
-    virtual BOOL    GetCopyTable            () const = 0;
-    virtual void    SetCopyTable            (BOOL bFlag=TRUE) = 0;
-    virtual void    EnableCopyTable         (BOOL bFlag=TRUE) = 0;
+    virtual USHORT	GetSelectedDocument		() const = 0;
+    virtual USHORT	GetSelectedTable		() const = 0;
+    virtual BOOL	GetCopyTable			() const = 0;
+    virtual void	SetCopyTable			(BOOL bFlag=TRUE) = 0;
+    virtual void	EnableCopyTable			(BOOL bFlag=TRUE) = 0;
 };
 
 class AbstractScNameCreateDlg : public VclAbstractDialog  //add for ScNameCreateDlg
 {
 public:
-    virtual USHORT          GetFlags() const = 0;
+    virtual USHORT			GetFlags() const = 0;
 };
 
 class AbstractScNamePasteDlg : public VclAbstractDialog  //add for ScNamePasteDlg
 {
 public:
-    virtual String          GetSelectedName() const = 0;
+    virtual String			GetSelectedName() const = 0;
 };
 
 class AbstractScPivotFilterDlg : public VclAbstractDialog  //add for ScPivotFilterDlg
 {
 public:
-    virtual const ScQueryItem&  GetOutputItem() = 0;
+    virtual const ScQueryItem&	GetOutputItem() = 0;
 };
 
 class AbstractScDPFunctionDlg : public VclAbstractDialog  //add for ScDPFunctionDlg
@@ -283,9 +283,9 @@ class AbstractScShowTabDlg : public VclAbstractDialog  //add for ScShowTabDlg
 {
 public:
     virtual void    Insert( const String& rString, BOOL bSelected ) = 0;
-    virtual USHORT  GetSelectEntryCount() const = 0;
+    virtual USHORT	GetSelectEntryCount() const = 0;
     virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ) = 0;
-    virtual String  GetSelectEntry(USHORT nPos) const = 0;
+    virtual String	GetSelectEntry(USHORT nPos) const = 0;
     virtual USHORT  GetSelectEntryPos(USHORT nPos) const = 0;
 };
 
@@ -318,16 +318,16 @@ public:
 class ScAbstractDialogFactory
 {
 public:
-    SC_DLLPUBLIC static ScAbstractDialogFactory*    Create();
+    SC_DLLPUBLIC static ScAbstractDialogFactory* 	Create();
 
-    virtual     AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
+    virtual 	AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
                                                                     SvStream* pInStream, int nId,
                                                                     sal_Unicode cSep = '\t') = 0;
 
     virtual     AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ) = 0;
 
-    virtual     AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*                    pParent, //add for ScAutoFormatDlg
-                                                                ScAutoFormat*               pAutoFormat,
+    virtual		AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window*					pParent, //add for ScAutoFormatDlg
+                                                                ScAutoFormat*				pAutoFormat,
                                                                 const ScAutoFormatData*    pSelFormatData,
                                                                 ScDocument*                pDoc,
                                                                 int nId) = 0;
@@ -336,11 +336,11 @@ public:
                                                                 BOOL bCol = FALSE,
                                                                 BOOL bRow = FALSE) = 0;
 
-    virtual VclAbstractDialog * CreateScColOrRowDlg( Window*            pParent, //add for ScColOrRowDlg
-                                                    const String&   rStrTitle,
-                                                    const String&   rStrLabel,
+    virtual VclAbstractDialog * CreateScColOrRowDlg( Window*			pParent, //add for ScColOrRowDlg
+                                                    const String&	rStrTitle,
+                                                    const String&	rStrLabel,
                                                     int nId,
-                                                    BOOL                bColDefault = TRUE ) = 0;
+                                                    BOOL				bColDefault = TRUE ) = 0;
     virtual VclAbstractDialog * CreateScSortWarningDlg ( Window* pParent, const String& rExtendText, const String& rCurrentText, int nId ) = 0;  //add for ScSortWarningDlg
     virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg
 
@@ -357,53 +357,53 @@ public:
 
     virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
                                                                  USHORT  nCheckDefaults = 0 ) = 0;
-    virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*        pParent, //add for ScFillSeriesDlg
-                                                            ScDocument& rDocument,
-                                                            FillDir     eFillDir,
-                                                            FillCmd     eFillCmd,
-                                                            FillDateCmd eFillDateCmd,
-                                                            String          aStartStr,
-                                                            double          fStep,
-                                                            double          fMax,
-                                                            USHORT          nPossDir,
+    virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*		pParent, //add for ScFillSeriesDlg
+                                                            ScDocument&	rDocument,
+                                                            FillDir		eFillDir,
+                                                            FillCmd		eFillCmd,
+                                                            FillDateCmd	eFillDateCmd,
+                                                            String			aStartStr,
+                                                            double			fStep,
+                                                            double			fMax,
+                                                            USHORT			nPossDir,
                                                             int nId) = 0;
 
     virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
-                                                            USHORT  nResId,
+                                                            USHORT	nResId,
                                                             int nId,
-                                                            BOOL    bUnGroup = FALSE,
-                                                            BOOL    bRows    = TRUE  ) = 0;
+                                                            BOOL	bUnGroup = FALSE,
+                                                            BOOL	bRows    = TRUE  ) = 0;
 
     virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg
                                                                 int nId,
                                                             BOOL bDisallowCellMove = FALSE ) = 0;
 
-    virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*        pParent, //add for ScInsertContentsDlg
+    virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window*		pParent, //add for ScInsertContentsDlg
                                                                     int nId,
-                                                                    USHORT          nCheckDefaults = 0,
-                                                                    const String*   pStrTitle = NULL ) = 0;
+                                                                    USHORT  		nCheckDefaults = 0,
+                                                                    const String*	pStrTitle = NULL ) = 0;
 
     virtual AbstractScInsertTableDlg * CreateScInsertTableDlg ( Window* pParent, ScViewData& rViewData,  //add for ScInsertTableDlg
                                                                 SCTAB nTabCount, bool bFromFile, int nId) = 0;
 
     virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg
-                                                            USHORT  nResId,
+                                                            USHORT	nResId,
                                                         const String& aTitle,
                                                         const String& aLbTitle,
-                                                                List&   aEntryList,
+                                                                List& 	aEntryList,
                                                             int nId ) = 0;
     virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg (  Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg
 
-    virtual AbstractScMetricInputDlg * CreateScMetricInputDlg (  Window*        pParent, //add for ScMetricInputDlg
-                                                                USHORT      nResId,     // Ableitung fuer jeden Dialog!
-                                                                long            nCurrent,
-                                                                long            nDefault,
+    virtual AbstractScMetricInputDlg * CreateScMetricInputDlg (  Window*		pParent, //add for ScMetricInputDlg
+                                                                USHORT		nResId,		// Ableitung fuer jeden Dialog!
+                                                                long			nCurrent,
+                                                                long			nDefault,
                                                                 int nId ,
-                                                                FieldUnit       eFUnit    = FUNIT_MM,
-                                                                USHORT      nDecimals = 2,
-                                                                long            nMaximum  = 1000,
-                                                                long            nMinimum  = 0,
-                                                                long            nFirst    = 1,
+                                                                FieldUnit		eFUnit	  = FUNIT_MM,
+                                                                USHORT		nDecimals = 2,
+                                                                long			nMaximum  = 1000,
+                                                                long			nMinimum  = 0,
+                                                                long			nFirst	  = 1,
                                                                 long          nLast     = 100 ) = 0;
 
     virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(  Window* pParent, int nId ) = 0; //add for ScMoveTableDlg
@@ -414,7 +414,7 @@ public:
                                                             int nId , BOOL bInsList=TRUE ) = 0;
 
     virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg
-                                                                const SfxItemSet&   rArgSet, USHORT nSourceTab , int nId ) = 0;
+                                                                const SfxItemSet&	rArgSet, USHORT nSourceTab , int nId ) = 0;
 
     virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId,
                                                                 const ScDPLabelDataVec& rLabelVec,
@@ -461,34 +461,34 @@ public:
                                                                 ULONG nHelpId ,
                                                                 int nId ) = 0;
 
-    virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window*                 pParent, //add for ScImportOptionsDlg
+    virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* 				pParent, //add for ScImportOptionsDlg
                                                                     int nId,
                                                                     BOOL                    bAscii = TRUE,
-                                                                    const ScImportOptions*  pOptions = NULL,
-                                                                    const String*           pStrTitle = NULL,
+                                                                    const ScImportOptions*	pOptions = NULL,
+                                                                    const String*			pStrTitle = NULL,
                                                                     BOOL                    bMultiByte = FALSE,
                                                                     BOOL                    bOnlyDbtoolsEncodings = FALSE,
                                                                     BOOL                    bImport = TRUE ) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*    pFrame, //add for ScAttrDlg
-                                                    Window*          pParent,
+    virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame*	 pFrame, //add for ScAttrDlg
+                                                    Window*			 pParent,
                                                     const SfxItemSet* pCellAttrs,
                                                     int nId) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*     pFrame, //add for ScHFEditDlg
-                                                    Window*         pParent,
-                                                    const SfxItemSet&   rCoreSet,
-                                                    const String&       rPageStyle,
+    virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*		pFrame, //add for ScHFEditDlg
+                                                    Window*			pParent,
+                                                    const SfxItemSet&	rCoreSet,
+                                                    const String&		rPageStyle,
                                                     int nId,
-                                                    USHORT              nResId = RID_SCDLG_HFEDIT ) = 0;
+                                                    USHORT				nResId = RID_SCDLG_HFEDIT ) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*                pParent,//add for ScStyleDlg
-                                                    SfxStyleSheetBase&  rStyleBase,
-                                                    USHORT              nRscId,
+    virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*				pParent,//add for ScStyleDlg
+                                                    SfxStyleSheetBase&	rStyleBase,
+                                                    USHORT				nRscId,
                                                     int nId) = 0;
 
-    virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window*             pParent, //add for ScSubTotalDlg
-                                                        const SfxItemSet*   pArgSet,
+    virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window*				pParent, //add for ScSubTotalDlg
+                                                        const SfxItemSet*	pArgSet,
                                                         int nId) = 0;
 
     virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg
@@ -499,16 +499,16 @@ public:
 
     //<!--Modified by PengYunQuan for Validity Cell Range Picker
     //virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
-    //                                              const SfxItemSet* pArgSet,int nId  ) = 0;
+    //												const SfxItemSet* pArgSet,int nId  ) = 0;
 
     virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg
                                                         const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh  ) = 0;
     //-->Modified by PengYunQuan for Validity Cell Range Picker
-    virtual SfxAbstractTabDialog * CreateScSortDlg( Window*          pParent, //add for ScSortDlg
+    virtual SfxAbstractTabDialog * CreateScSortDlg( Window*			 pParent, //add for ScSortDlg
                                                     const SfxItemSet* pArgSet,int nId ) = 0;
     // for tabpage
-    virtual CreateTabPage               GetTabPageCreatorFunc( USHORT nId ) = 0;
-    virtual GetTabPageRanges            GetTabPageRangesFunc( USHORT nId ) = 0;
+    virtual CreateTabPage				GetTabPageCreatorFunc( USHORT nId ) = 0;
+    virtual GetTabPageRanges			GetTabPageRangesFunc( USHORT nId ) = 0;
 };
 #endif