diff options
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/scabstdlg.hxx | 122 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 209 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 119 |
3 files changed, 173 insertions, 277 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 00ac2f00eb6b..10ccbf092b08 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -55,21 +55,21 @@ namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldReference; } } } } -class AbstractScImportAsciiDlg : public VclAbstractDialog //add for ScImportAsciiDlg +class AbstractScImportAsciiDlg : public VclAbstractDialog { public: virtual void GetOptions( ScAsciiOptions& rOpt ) = 0; virtual void SaveParameters() = 0; }; -class AbstractScAutoFormatDlg : public VclAbstractDialog //add for ScAutoFormatDlg +class AbstractScAutoFormatDlg : public VclAbstractDialog { public: virtual sal_uInt16 GetIndex() const = 0 ; virtual String GetCurrFormatName() = 0; }; -class AbstractScColRowLabelDlg : public VclAbstractDialog //add for ScColRowLabelDlg +class AbstractScColRowLabelDlg : public VclAbstractDialog { public: virtual sal_Bool IsCol() = 0; @@ -84,13 +84,13 @@ public: virtual bool CondFormatsChanged() = 0; }; -class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog //add for ScDataPilotDatabaseDlg +class AbstractScDataPilotDatabaseDlg :public VclAbstractDialog { public: virtual void GetValues( ScImportSourceDesc& rDesc ) = 0; }; -class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog //add for ScDataPilotSourceTypeDlg +class AbstractScDataPilotSourceTypeDlg : public VclAbstractDialog { public: virtual bool IsDatabase() const = 0; @@ -100,7 +100,7 @@ public: virtual void AppendNamedRange(const OUString& rName) = 0; }; -class AbstractScDataPilotServiceDlg : public VclAbstractDialog //add for ScDataPilotServiceDlg +class AbstractScDataPilotServiceDlg : public VclAbstractDialog { public: virtual String GetServiceName() const = 0; @@ -110,26 +110,26 @@ public: virtual String GetParPass() const = 0; }; -class AbstractScDeleteCellDlg : public VclAbstractDialog //add for ScDeleteCellDlg +class AbstractScDeleteCellDlg : public VclAbstractDialog { public: virtual DelCellCmd GetDelCellCmd() const = 0; }; //for dataform -class AbstractScDataFormDlg : public VclAbstractDialog //add for ScDeleteCellDlg +class AbstractScDataFormDlg : public VclAbstractDialog { }; -class AbstractScDeleteContentsDlg: public VclAbstractDialog //add for ScDeleteContentsDlg +class AbstractScDeleteContentsDlg: public VclAbstractDialog { public: virtual void DisableObjects() = 0 ; virtual sal_uInt16 GetDelContentsCmdBits() const = 0; }; -class AbstractScFillSeriesDlg: public VclAbstractDialog //add for ScFillSeriesDlg +class AbstractScFillSeriesDlg: public VclAbstractDialog { public: virtual FillDir GetFillDir() const = 0; @@ -142,19 +142,19 @@ public: virtual void SetEdStartValEnabled(sal_Bool bFlag=false) = 0; }; -class AbstractScGroupDlg : public VclAbstractDialog //add for ScGroupDlg +class AbstractScGroupDlg : public VclAbstractDialog { public: virtual sal_Bool GetColsChecked() const = 0; }; -class AbstractScInsertCellDlg : public VclAbstractDialog //add for ScInsertCellDlg +class AbstractScInsertCellDlg : public VclAbstractDialog { public: virtual InsCellCmd GetInsCellCmd() const = 0; }; -class AbstractScInsertContentsDlg : public VclAbstractDialog //add for ScInsertContentsDlg +class AbstractScInsertContentsDlg : public VclAbstractDialog { public: virtual sal_uInt16 GetInsContentsCmdBits() const = 0; @@ -169,7 +169,7 @@ public: virtual InsCellCmd GetMoveMode() = 0; }; -class AbstractScInsertTableDlg : public VclAbstractDialog //add for ScInsertTableDlg +class AbstractScInsertTableDlg : public VclAbstractDialog { public: virtual sal_Bool GetTablesFromFile() = 0; @@ -182,13 +182,13 @@ public: }; -class AbstractScSelEntryDlg : public VclAbstractDialog //add for ScSelEntryDlg +class AbstractScSelEntryDlg : public VclAbstractDialog { public: virtual String GetSelectEntry() const = 0; }; -class AbstractScLinkedAreaDlg : public VclAbstractDialog2 //add for ScLinkedAreaDlg +class AbstractScLinkedAreaDlg : public VclAbstractDialog2 { public: virtual void InitFromOldLink( const String& rFile, const String& rFilter, @@ -201,13 +201,13 @@ public: virtual sal_uLong GetRefresh() = 0; // 0 if disabled }; -class AbstractScMetricInputDlg : public VclAbstractDialog //add for ScMetricInputDlg +class AbstractScMetricInputDlg : public VclAbstractDialog { public: virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const = 0; }; -class AbstractScMoveTableDlg : public VclAbstractDialog //add for ScMoveTableDlg +class AbstractScMoveTableDlg : public VclAbstractDialog { public: virtual sal_uInt16 GetSelectedDocument () const = 0; @@ -226,27 +226,27 @@ public: virtual sal_uInt16 GetFlags() const = 0; }; -class AbstractScNamePasteDlg : public VclAbstractDialog //add for ScNamePasteDlg +class AbstractScNamePasteDlg : public VclAbstractDialog { public: virtual std::vector<OUString> GetSelectedNames() const = 0; virtual bool IsAllSelected() const = 0; }; -class AbstractScPivotFilterDlg : public VclAbstractDialog //add for ScPivotFilterDlg +class AbstractScPivotFilterDlg : public VclAbstractDialog { public: virtual const ScQueryItem& GetOutputItem() = 0; }; -class AbstractScDPFunctionDlg : public VclAbstractDialog //add for ScDPFunctionDlg +class AbstractScDPFunctionDlg : public VclAbstractDialog { public: virtual sal_uInt16 GetFuncMask() const = 0; virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const = 0; }; -class AbstractScDPSubtotalDlg : public VclAbstractDialog //add for ScDPSubtotalDlg +class AbstractScDPSubtotalDlg : public VclAbstractDialog { public: virtual sal_uInt16 GetFuncMask() const = 0; @@ -266,13 +266,13 @@ public: virtual sal_Int32 GetDatePart() const = 0; }; -class AbstractScDPShowDetailDlg : public VclAbstractDialog //add for ScDPShowDetailDlg +class AbstractScDPShowDetailDlg : public VclAbstractDialog { public: virtual String GetDimensionName() const = 0; }; -class AbstractScNewScenarioDlg : public VclAbstractDialog //add for ScNewScenarioDlg +class AbstractScNewScenarioDlg : public VclAbstractDialog { public: @@ -283,7 +283,7 @@ public: Color& rColor, sal_uInt16& rFlags ) const = 0; }; -class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg +class AbstractScShowTabDlg : public VclAbstractDialog { public: virtual void Insert( const String& rString, sal_Bool bSelected ) = 0; @@ -293,29 +293,29 @@ public: virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const = 0; }; -class AbstractScSortWarningDlg : public VclAbstractDialog //add for ScSortWarningDlg +class AbstractScSortWarningDlg : public VclAbstractDialog { }; -class AbstractScStringInputDlg : public VclAbstractDialog //add for ScStringInputDlg +class AbstractScStringInputDlg : public VclAbstractDialog { public: virtual void GetInputString( OUString& rString ) const = 0; }; -class AbstractScTabBgColorDlg : public VclAbstractDialog //add for ScTabBgColorDlg +class AbstractScTabBgColorDlg : public VclAbstractDialog { public: virtual void GetSelectedColor( Color& rColor ) const = 0; }; -class AbstractScImportOptionsDlg : public VclAbstractDialog //add for ScImportOptionsDlg +class AbstractScImportOptionsDlg : public VclAbstractDialog { public: virtual void GetImportOptions( ScImportOptions& rOptions ) const = 0; }; -class AbstractScTextImportOptionsDlg : public VclAbstractDialog //add for ScLangChooserDlg +class AbstractScTextImportOptionsDlg : public VclAbstractDialog { public: virtual LanguageType GetLanguageType() const = 0; @@ -327,51 +327,51 @@ class ScAbstractDialogFactory public: SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, SvStream* pInStream, ScImportAsciiCall eCall) = 0; virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0; - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc, int nId) = 0; - virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg + virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, int nId, sal_Bool bCol = false, sal_Bool bRow = false) = 0; - virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg + virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, const String& rStrTitle, const String& rStrLabel, int nId, sal_Bool bColDefault = sal_True ) = 0; - virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ) = 0; //add for ScSortWarningDlg + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const String& rExtendText, const String& rCurrentText ) = 0; virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) = 0; - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; //add for ScDataPilotDatabaseDlg + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ) = 0; virtual AbstractScDataPilotSourceTypeDlg * CreateScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal) = 0; - virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg + virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ) = 0; - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false) = 0 ; //add for ScDeleteCellDlg + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false) = 0 ; //for dataform virtual AbstractScDataFormDlg * CreateScDataFormDlg(Window* pParent, ScTabViewShell* pTabViewShell) = 0; - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, sal_uInt16 nCheckDefaults = 0) = 0; - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -381,15 +381,15 @@ public: double fMax, sal_uInt16 nPossDir) = 0; - virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg + virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, bool bUnGroup = false, bool bRows = true ) = 0; - virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg + virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = false ) = 0; - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, int nId, sal_uInt16 nCheckDefaults = 0, const OUString* pStrTitle = NULL ) = 0; @@ -397,11 +397,11 @@ public: virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile) = 0; - virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg + virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, const std::vector<String> &rEntryList ) = 0; - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0; //add for ScLinkedAreaDlg + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0; - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, sal_uInt16 nResId, // derivative for every dialog! long nCurrent, long nDefault, @@ -419,9 +419,9 @@ public: virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, sal_uInt16 nFlags) = 0; - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0; // add for ScNamePasteDlg + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) = 0; - virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg + virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) = 0; virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, @@ -450,26 +450,26 @@ public: ScDPObject& rDPObj, sal_uInt16 nOrient ) = 0; - virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg + virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, int nId, sal_Bool bEdit = false, sal_Bool bSheetProtected = false ) = 0; - virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0; //add for ScShowTabDlg + virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ) = 0; - virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, //add for ScStringInputDlg + virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, const OString& sHelpId, const OString& sEditHelpId, int nId ) = 0; - virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScTabBgColorDlg + virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color const OString& , int nId ) = 0; - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, int nId, sal_Bool bAscii = sal_True, const ScImportOptions* pOptions = NULL, @@ -478,34 +478,34 @@ public: sal_Bool bOnlyDbtoolsEncodings = false, sal_Bool bImport = sal_True ) = 0; - virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg + virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, Window* pParent, const SfxItemSet* pCellAttrs ) = 0; - virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg + virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ) = 0; - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg + virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, const SfxItemSet* pArgSet, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg + virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell, int nId ) = 0; - virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,//add for ScParagraphDlg + virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , int nId ) = 0; - virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg + virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) = 0; - virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg + virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, const SfxItemSet* pArgSet,int nId ) = 0; // for tabpage diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 3cecf6fa2470..a2f01ef83745 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scdlgfact.hxx" @@ -116,7 +115,6 @@ IMPL_ABSTDLG_BASE(AbstractScImportOptionsDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScTextImportOptionsDlg_Impl); IMPL_ABSTDLG_BASE(ScAbstractTabDialog_Impl); -// ScAbstractTabDialog_Impl begin void ScAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); @@ -141,6 +139,7 @@ void ScAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } + //From class Window. void ScAbstractTabDialog_Impl::SetText( const OUString& rStr ) { @@ -151,7 +150,6 @@ OUString ScAbstractTabDialog_Impl::GetText() const return pDlg->GetText(); } -// AbstractScImportAsciiDlg_Impl begin void AbstractScImportAsciiDlg_Impl::GetOptions( ScAsciiOptions& rOpt ) { pDlg->GetOptions( rOpt ); @@ -162,9 +160,6 @@ void AbstractScImportAsciiDlg_Impl::SaveParameters() pDlg->SaveParameters(); } -// AbstractScImportAsciiDlg_Impl end - -//AbstractScAutoFormatDlg_Impl begin sal_uInt16 AbstractScAutoFormatDlg_Impl::GetIndex() const { return pDlg->GetIndex(); @@ -175,35 +170,21 @@ String AbstractScAutoFormatDlg_Impl::GetCurrFormatName() return pDlg->GetCurrFormatName(); } -//AbstractScAutoFormatDlg_Impl end - - - -//AbstractScColRowLabelDlg_Impl begin sal_Bool AbstractScColRowLabelDlg_Impl::IsCol() { return pDlg->IsCol(); } + sal_Bool AbstractScColRowLabelDlg_Impl::IsRow() { return pDlg->IsRow(); } -//AbstractScColRowLabelDlg_Impl end - - -//AbstractScDataPilotDatabaseDlg_Impl begin - - void AbstractScDataPilotDatabaseDlg_Impl::GetValues( ScImportSourceDesc& rDesc ) { pDlg->GetValues(rDesc); } -//AbstractScDataPilotDatabaseDlg_Impl end - -//AbstractScDataPilotSourceTypeDlg_Impl begin - bool AbstractScDataPilotSourceTypeDlg_Impl::IsDatabase() const { return pDlg->IsDatabase(); @@ -229,10 +210,6 @@ void AbstractScDataPilotSourceTypeDlg_Impl::AppendNamedRange(const OUString& rNa pDlg->AppendNamedRange(rName); } -//AbstractScDataPilotSourceTypeDlg_Impl end - - -// AbstractScDataPilotServiceDlg_Impl begin String AbstractScDataPilotServiceDlg_Impl::GetServiceName() const { return pDlg->GetServiceName(); @@ -242,40 +219,37 @@ String AbstractScDataPilotServiceDlg_Impl::GetParSource() const { return pDlg->GetParSource(); } + String AbstractScDataPilotServiceDlg_Impl::GetParName() const { return pDlg->GetParName(); } + String AbstractScDataPilotServiceDlg_Impl::GetParUser() const { return pDlg->GetParUser(); } + String AbstractScDataPilotServiceDlg_Impl::GetParPass() const { return pDlg->GetParPass(); } -//AbstractScDataPilotServiceDlg_Impl end - -//AbstractScDeleteCellDlg_Impl begin DelCellCmd AbstractScDeleteCellDlg_Impl::GetDelCellCmd() const { return pDlg->GetDelCellCmd(); } -//AbstractScDeleteCellDlg_Impl end - void AbstractScDeleteContentsDlg_Impl::DisableObjects() { pDlg->DisableObjects(); } + sal_uInt16 AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() const { return pDlg->GetDelContentsCmdBits(); } - - FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const { return pDlg->GetFillDir(); @@ -295,60 +269,57 @@ double AbstractScFillSeriesDlg_Impl::GetStart() const { return pDlg->GetStart(); } + double AbstractScFillSeriesDlg_Impl::GetStep() const { return pDlg->GetStep(); } + double AbstractScFillSeriesDlg_Impl::GetMax() const { return pDlg->GetMax(); } + String AbstractScFillSeriesDlg_Impl::GetStartStr() const { return pDlg->GetStartStr(); } + void AbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(sal_Bool bFlag) { pDlg->SetEdStartValEnabled(bFlag); } - - sal_Bool AbstractScGroupDlg_Impl::GetColsChecked() const { return pDlg->GetColsChecked(); } - - - InsCellCmd AbstractScInsertCellDlg_Impl::GetInsCellCmd() const { return pDlg->GetInsCellCmd(); } - - - - sal_uInt16 AbstractScInsertContentsDlg_Impl::GetInsContentsCmdBits() const { return pDlg->GetInsContentsCmdBits(); } - sal_uInt16 AbstractScInsertContentsDlg_Impl::GetFormulaCmdBits() const { return pDlg->GetFormulaCmdBits(); } + sal_Bool AbstractScInsertContentsDlg_Impl::IsSkipEmptyCells() const { return pDlg->IsSkipEmptyCells(); } + sal_Bool AbstractScInsertContentsDlg_Impl::IsLink() const { return pDlg->IsLink(); } + void AbstractScInsertContentsDlg_Impl::SetFillMode( sal_Bool bSet ) { pDlg->SetFillMode( bSet ); @@ -363,10 +334,12 @@ sal_Bool AbstractScInsertContentsDlg_Impl::IsTranspose() const { return pDlg->IsTranspose(); } + void AbstractScInsertContentsDlg_Impl::SetChangeTrack( sal_Bool bSet ) { pDlg->SetChangeTrack( bSet ); } + void AbstractScInsertContentsDlg_Impl::SetCellShiftDisabled( int nDisable ) { pDlg->SetCellShiftDisabled( nDisable ); @@ -377,48 +350,46 @@ InsCellCmd AbstractScInsertContentsDlg_Impl::GetMoveMode() return pDlg->GetMoveMode(); } - - - sal_Bool AbstractScInsertTableDlg_Impl::GetTablesFromFile() { return pDlg->GetTablesFromFile(); } -sal_Bool AbstractScInsertTableDlg_Impl::GetTablesAsLink() +sal_Bool AbstractScInsertTableDlg_Impl::GetTablesAsLink() { return pDlg->GetTablesAsLink(); } -const String* AbstractScInsertTableDlg_Impl::GetFirstTable( sal_uInt16* pN ) + +const String* AbstractScInsertTableDlg_Impl::GetFirstTable( sal_uInt16* pN ) { return pDlg->GetFirstTable( pN ); } -ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables() + +ScDocShell* AbstractScInsertTableDlg_Impl::GetDocShellTables() { return pDlg->GetDocShellTables(); } -sal_Bool AbstractScInsertTableDlg_Impl::IsTableBefore() + +sal_Bool AbstractScInsertTableDlg_Impl::IsTableBefore() { return pDlg->IsTableBefore(); } -sal_uInt16 AbstractScInsertTableDlg_Impl::GetTableCount() + +sal_uInt16 AbstractScInsertTableDlg_Impl::GetTableCount() { return pDlg->GetTableCount(); } -const String* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN ) + +const String* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN ) { return pDlg->GetNextTable( pN ); } - - String AbstractScSelEntryDlg_Impl::GetSelectEntry() const { return pDlg->GetSelectEntry(); } - - void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const String& rFile, const String& rFilter, const String& rOptions, const String& rSource, sal_uLong nRefresh ) @@ -430,24 +401,27 @@ String AbstractScLinkedAreaDlg_Impl::GetURL() { return pDlg->GetURL(); } + String AbstractScLinkedAreaDlg_Impl::GetFilter() { return pDlg->GetFilter(); } + String AbstractScLinkedAreaDlg_Impl::GetOptions() { return pDlg->GetOptions(); } + String AbstractScLinkedAreaDlg_Impl::GetSource() { return pDlg->GetSource(); } + sal_uLong AbstractScLinkedAreaDlg_Impl::GetRefresh() { return pDlg->GetRefresh(); } - ScConditionalFormatList* AbstractScCondFormatManagerDlg_Impl::GetConditionalFormatList() { return pDlg->GetConditionalFormatList(); @@ -458,15 +432,12 @@ bool AbstractScCondFormatManagerDlg_Impl::CondFormatsChanged() return pDlg->CondFormatsChanged(); } - long AbstractScMetricInputDlg_Impl::GetInputValue( FieldUnit eUnit ) const { return pDlg->GetInputValue( eUnit ); } - - sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedDocument() const { return pDlg->GetSelectedDocument(); @@ -476,81 +447,77 @@ sal_uInt16 AbstractScMoveTableDlg_Impl::GetSelectedTable() const { return pDlg->GetSelectedTable(); } + bool AbstractScMoveTableDlg_Impl::GetCopyTable() const { return pDlg->GetCopyTable(); } + bool AbstractScMoveTableDlg_Impl::GetRenameTable() const { return pDlg->GetRenameTable(); } + void AbstractScMoveTableDlg_Impl::GetTabNameString( OUString& rString ) const { pDlg->GetTabNameString( rString ); } + void AbstractScMoveTableDlg_Impl::SetForceCopyTable() { return pDlg->SetForceCopyTable(); } + void AbstractScMoveTableDlg_Impl::EnableCopyTable(sal_Bool bFlag) { return pDlg->EnableCopyTable( bFlag); } + void AbstractScMoveTableDlg_Impl::EnableRenameTable(sal_Bool bFlag) { return pDlg->EnableRenameTable( bFlag); } - - - sal_uInt16 AbstractScNameCreateDlg_Impl::GetFlags() const { return pDlg->GetFlags(); } - - std::vector<OUString> AbstractScNamePasteDlg_Impl::GetSelectedNames() const { return pDlg->GetSelectedNames(); } - bool AbstractScNamePasteDlg_Impl::IsAllSelected() const { return pDlg->IsAllSelected(); } - const ScQueryItem& AbstractScPivotFilterDlg_Impl::GetOutputItem() { return pDlg->GetOutputItem(); } - - sal_uInt16 AbstractScDPFunctionDlg_Impl::GetFuncMask() const { return pDlg->GetFuncMask(); } + ::com::sun::star::sheet::DataPilotFieldReference AbstractScDPFunctionDlg_Impl::GetFieldRef() const { return pDlg->GetFieldRef(); } - - sal_uInt16 AbstractScDPSubtotalDlg_Impl::GetFuncMask() const { return pDlg->GetFuncMask(); } + void AbstractScDPSubtotalDlg_Impl::FillLabelData( ScDPLabelData& rLabelData ) const { pDlg->FillLabelData( rLabelData ); } - ScDPNumGroupInfo AbstractScDPNumGroupDlg_Impl::GetGroupInfo() const { return pDlg->GetGroupInfo(); @@ -566,7 +533,6 @@ sal_Int32 AbstractScDPDateGroupDlg_Impl::GetDatePart() const return pDlg->GetDatePart(); } - String AbstractScDPShowDetailDlg_Impl::GetDimensionName() const { return pDlg->GetDimensionName(); @@ -593,44 +559,38 @@ sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryCount() const { return pDlg->GetSelectEntryCount(); } + void AbstractScShowTabDlg_Impl::SetDescription( const String& rTitle, const String& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) { pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } + sal_uInt16 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_uInt16 nPos) const { return pDlg->GetSelectEntryPos( nPos); } + String AbstractScShowTabDlg_Impl::GetSelectEntry(sal_uInt16 nPos) const { return pDlg->GetSelectEntry(nPos); } - - void AbstractScStringInputDlg_Impl::GetInputString( OUString& rString ) const { pDlg->GetInputString( rString ); } - - void AbstractScTabBgColorDlg_Impl::GetSelectedColor( Color& rColor ) const { pDlg->GetSelectedColor( rColor ); } - - - void AbstractScImportOptionsDlg_Impl::GetImportOptions( ScImportOptions& rOptions ) const { pDlg->GetImportOptions(rOptions); } -// add for AbstractScImportOptionsDlg_Impl end - LanguageType AbstractScTextImportOptionsDlg_Impl::GetLanguageType() const { @@ -642,18 +602,13 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const return pDlg->isDateConversionSet(); } - - // =========================Factories for createdialog =================== - - AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, String aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) { ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall ); return new AbstractScImportAsciiDlg_Impl( pDlg ); } -// ScImportAsciiDlg end AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(Window* pParent) { @@ -682,9 +637,6 @@ AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( W return 0; } - - - AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg(Window* pParent, int nId, sal_Bool bCol , @@ -705,10 +657,6 @@ AbstractScColRowLabelDlg * ScAbstractDialogFactory_Impl::CreateScColRowLabelDlg return 0; } - - - - VclAbstractDialog * ScAbstractDialogFactory_Impl::CreateScColOrRowDlg(Window* pParent, const String& rStrTitle, const String& rStrLabel, @@ -736,7 +684,6 @@ AbstractScSortWarningDlg* ScAbstractDialogFactory_Impl::CreateScSortWarningDlg( return new AbstractScSortWarningDlg_Impl( pDlg ); } - AbstractScCondFormatManagerDlg* ScAbstractDialogFactory_Impl::CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ) { @@ -799,9 +746,6 @@ AbstractScDataPilotServiceDlg* ScAbstractDialogFactory_Impl::CreateScDataPilotSe return 0; } -// add for ScDataPilotServiceDlg end - - AbstractScDeleteCellDlg* ScAbstractDialogFactory_Impl::CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) { @@ -823,9 +767,6 @@ AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContent return new AbstractScDeleteContentsDlg_Impl( pDlg ); } - - - AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Window* pParent, ScDocument& rDocument, FillDir eFillDir, @@ -867,9 +808,6 @@ AbstractScInsertCellDlg * ScAbstractDialogFactory_Impl::CreateScInsertCellDlg( W return 0; } - - - AbstractScInsertContentsDlg * ScAbstractDialogFactory_Impl::CreateScInsertContentsDlg( Window* pParent, int nId, sal_uInt16 nCheckDefaults, @@ -897,14 +835,12 @@ AbstractScInsertTableDlg * ScAbstractDialogFactory_Impl::CreateScInsertTableDlg( return new AbstractScInsertTableDlg_Impl( pDlg ); } -// add for ScSelEntryDlg begin AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Window* pParent, const std::vector<String> &rEntryList ) { ScSelEntryDlg * pDlg = new ScSelEntryDlg( pParent, rEntryList ); return new AbstractScSelEntryDlg_Impl( pDlg ); } -// add for ScSelEntryDlg end AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(Window* pParent) { @@ -943,9 +879,6 @@ AbstractScMetricInputDlg * ScAbstractDialogFactory_Impl::CreateScMetricInputDlg return 0; } - - - AbstractScMoveTableDlg * ScAbstractDialogFactory_Impl::CreateScMoveTableDlg(Window* pParent, const String& rDefault) { @@ -965,7 +898,6 @@ AbstractScNamePasteDlg * ScAbstractDialogFactory_Impl::CreateScNamePasteDlg ( Wi return new AbstractScNamePasteDlg_Impl( pDlg ); } - AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg ( Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) { @@ -984,9 +916,6 @@ AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg return 0; } - - - AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent, int nId, const ScDPLabelDataVector& rLabelVec, @@ -1008,8 +937,6 @@ AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( return 0; } - - AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( Window* pParent, int nId, ScDPObject& rDPObj, @@ -1033,7 +960,6 @@ AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( return 0; } - AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg( Window* pParent, int nId, const ScDPNumGroupInfo& rInfo ) { @@ -1051,7 +977,6 @@ AbstractScDPDateGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPDateGroupDlg( return 0; } - AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDlg ( Window* pParent, int nId, ScDPObject& rDPObj, sal_uInt16 nOrient ) { @@ -1060,8 +985,6 @@ AbstractScDPShowDetailDlg * ScAbstractDialogFactory_Impl::CreateScDPShowDetailDl return 0; } - - AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg ( Window* pParent, const String& rName, int nId, sal_Bool bEdit , sal_Bool bSheetProtected ) @@ -1081,8 +1004,6 @@ AbstractScNewScenarioDlg * ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg return 0; } - - AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window* pParent, int nId ) { ScShowTabDlg * pDlg=NULL; @@ -1100,11 +1021,7 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window return 0; } - - - - - AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent, +AbstractScStringInputDlg * ScAbstractDialogFactory_Impl::CreateScStringInputDlg ( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, @@ -1126,8 +1043,6 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window return 0; } - - AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg ( Window* pParent, const String& rTitle, @@ -1136,23 +1051,21 @@ AbstractScTabBgColorDlg * ScAbstractDialogFactory_Impl::CreateScTabBgColorDlg ( const OString& sHelpId , int nId ) { -ScTabBgColorDlg * pDlg=NULL; -switch ( nId ) -{ - case RID_SCDLG_TAB_BG_COLOR : - pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, sHelpId ); - break; - default: - break; -} + ScTabBgColorDlg * pDlg=NULL; + switch ( nId ) + { + case RID_SCDLG_TAB_BG_COLOR : + pDlg = new ScTabBgColorDlg( pParent, rTitle, rTabBgColorNoColorText, rDefaultColor, sHelpId ); + break; + default: + break; + } -if ( pDlg ) - return new AbstractScTabBgColorDlg_Impl( pDlg ); -return 0; + if ( pDlg ) + return new AbstractScTabBgColorDlg_Impl( pDlg ); + return 0; } - - AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptionsDlg ( Window* pParent, int nId, sal_Bool bAscii, @@ -1177,7 +1090,6 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions return 0; } - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFrame* pFrame, Window* pParent, const SfxItemSet* pCellAttrs) { @@ -1188,7 +1100,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFram #undef SfxTabDialog #undef ScAbstractTabDialog_Impl - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame* pFrame, Window* pParent, const SfxItemSet& rCoreSet, @@ -1237,8 +1148,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewF return pDlg ? new ScAbstractTabDialog_Impl( pDlg ) : NULL; } - - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, @@ -1260,8 +1169,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( Window* return 0; } - - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window* pParent, const SfxItemSet* pArgSet, int nId) @@ -1281,8 +1188,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg( Window return 0; } - - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell, int nId ) { @@ -1301,8 +1206,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( Window* pP return 0; } - - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , int nId ) { @@ -1321,8 +1224,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo return 0; } - - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent, const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) { @@ -1341,7 +1242,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Wind return 0; } - SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* pParent, const SfxItemSet* pArgSet,int nId ) { @@ -1363,7 +1263,6 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg( Window* #undef SfxTabDialog #undef ScAbstractTabDialog_Impl - //------------------ Factories for TabPages-------------------- CreateTabPage ScAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId ) { diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index d2155db8962e..94a9564c1678 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -100,26 +100,26 @@ long Class::GetResult() \ return pDlg->GetResult(); \ } -class ScVclAbstractDialog_Impl : public VclAbstractDialog //add for ScColOrRowDlg +class ScVclAbstractDialog_Impl : public VclAbstractDialog { DECL_ABSTDLG_BASE(ScVclAbstractDialog_Impl,Dialog) }; -class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg //add for ScImportAsciiDlg +class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg { DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg) virtual void GetOptions( ScAsciiOptions& rOpt ); virtual void SaveParameters(); }; -class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg //add for ScAutoFormatDlg +class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg { DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg) virtual sal_uInt16 GetIndex() const; virtual String GetCurrFormatName(); }; -class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg //add for ScColRowLabelDlg +class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg { DECL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl,ScColRowLabelDlg) virtual sal_Bool IsCol(); @@ -135,13 +135,13 @@ class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDl virtual bool CondFormatsChanged(); }; -class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg //add for ScDataPilotDatabaseDlg +class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg) virtual void GetValues( ScImportSourceDesc& rDesc ); }; -class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg //add for ScDataPilotSourceTypeDlg +class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg) virtual bool IsDatabase() const; @@ -151,7 +151,7 @@ class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTy virtual void AppendNamedRange(const OUString& rName); }; -class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg //add for ScDataPilotServiceDlg +class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg) virtual String GetServiceName() const; @@ -161,26 +161,26 @@ class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg virtual String GetParPass() const; }; -class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg //add for ScDeleteCellDlg +class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg { DECL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl,ScDeleteCellDlg) virtual DelCellCmd GetDelCellCmd() const; }; //for dataform -class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg //add for ScDataFormDlg +class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg { DECL_ABSTDLG_BASE(AbstractScDataFormDlg_Impl,ScDataFormDlg); }; -class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg //add for ScDeleteContentsDlg +class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg { DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg) virtual void DisableObjects(); virtual sal_uInt16 GetDelContentsCmdBits() const; }; -class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg //add for ScFillSeriesDlg +class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg { DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg) virtual FillDir GetFillDir() const; @@ -193,19 +193,19 @@ class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg //add for ScF virtual void SetEdStartValEnabled(sal_Bool bFlag=false); }; -class AbstractScGroupDlg_Impl : public AbstractScGroupDlg //add for ScGroupDlg +class AbstractScGroupDlg_Impl : public AbstractScGroupDlg { DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg) virtual sal_Bool GetColsChecked() const; }; -class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg //add for ScInsertCellDlg +class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg { DECL_ABSTDLG_BASE( AbstractScInsertCellDlg_Impl, ScInsertCellDlg) virtual InsCellCmd GetInsCellCmd() const ; }; -class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg //add for ScInsertContentsDlg +class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg { DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg) virtual sal_uInt16 GetInsContentsCmdBits() const; @@ -220,7 +220,7 @@ class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg //a virtual InsCellCmd GetMoveMode(); }; -class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg //add for ScInsertTableDlg +class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg { DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg) virtual sal_Bool GetTablesFromFile(); @@ -233,13 +233,13 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg //add for }; -class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg //add for ScSelEntryDlg +class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg { DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg ) virtual String GetSelectEntry() const; }; -class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg //add for ScLinkedAreaDlg +class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg { DECL_ABSTDLG2_BASE( AbstractScLinkedAreaDlg_Impl, ScLinkedAreaDlg) @@ -253,13 +253,13 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg //add for S virtual sal_uLong GetRefresh(); // 0 if disabled }; -class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg //add for ScMetricInputDlg +class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg { DECL_ABSTDLG_BASE( AbstractScMetricInputDlg_Impl, ScMetricInputDlg) virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; }; -class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScMoveTableDlg +class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg { DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg) virtual sal_uInt16 GetSelectedDocument () const; @@ -272,33 +272,33 @@ class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg //add for ScM virtual void EnableRenameTable (sal_Bool bFlag=true); }; -class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg //add for ScNameCreateDlg +class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg { DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg) virtual sal_uInt16 GetFlags() const; }; -class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg //add for ScNamePasteDlg +class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg { DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg ) virtual std::vector<OUString> GetSelectedNames() const; virtual bool IsAllSelected() const; }; -class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg //add for ScPivotFilterDlg +class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg { DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg) virtual const ScQueryItem& GetOutputItem(); }; -class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg //add for ScDPFunctionDlg +class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg { DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg) virtual sal_uInt16 GetFuncMask() const; virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const; }; -class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg //add for ScDPSubtotalDlg +class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg { DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg) virtual sal_uInt16 GetFuncMask() const; @@ -324,7 +324,7 @@ class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg virtual String GetDimensionName() const; }; -class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg //add for ScNewScenarioDlg +class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg { DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg ) virtual void SetScenarioData( const OUString& rName, const OUString& rComment, @@ -334,7 +334,7 @@ class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg //add for Color& rColor, sal_uInt16& rFlags ) const; }; -class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowTabDlg +class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg { DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) virtual void Insert( const String& rString, sal_Bool bSelected ); @@ -349,20 +349,19 @@ class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg DECL_ABSTDLG_BASE( AbstractScSortWarningDlg_Impl, ScSortWarningDlg ) }; - -class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg //add for ScStringInputDlg +class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg { DECL_ABSTDLG_BASE( AbstractScStringInputDlg_Impl, ScStringInputDlg ) virtual void GetInputString( OUString& rString ) const; }; -class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg //add for ScTabBgColorDlg +class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg { DECL_ABSTDLG_BASE( AbstractScTabBgColorDlg_Impl, ScTabBgColorDlg ) virtual void GetSelectedColor( Color& rColor ) const; }; -class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg //add for ScImportOptionsDlg +class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg { DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg) virtual void GetImportOptions( ScImportOptions& rOptions ) const; @@ -375,7 +374,6 @@ class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDl virtual bool IsDateConversionSet() const; }; -//add for ScAttrDlg , ScHFEditDlg, ScStyleDlg, ScSubTotalDlg, ScCharDlg, ScParagraphDlg, ScValidationDlg, ScSortDlg class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog ) @@ -397,23 +395,23 @@ class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory public: virtual ~ScAbstractDialogFactory_Impl() {} - virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg + virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, SvStream* pInStream, ScImportAsciiCall eCall); virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent); - virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg + virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc, int nId); - virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, //add for ScColRowLabelDlg + virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, int nId, sal_Bool bCol = false, sal_Bool bRow = false); - virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, //add for ScColOrRowDlg + virtual VclAbstractDialog * CreateScColOrRowDlg( Window* pParent, const String& rStrTitle, const String& rStrLabel, int nId, @@ -424,12 +422,12 @@ public: virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, const ScAddress& rPos, int nId ); - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); //add for ScDataPilotDatabaseDlg + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg (Window* pParent ,int nId ); virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal); - virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, //add for ScDataPilotServiceDlg + virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, int nId ); virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false ); @@ -438,10 +436,10 @@ public: virtual AbstractScDataFormDlg* CreateScDataFormDlg(Window* pParent, ScTabViewShell* pTabViewShell); - virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg + virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, sal_uInt16 nCheckDefaults = 0); - virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, //add for ScFillSeriesDlg + virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, @@ -450,15 +448,15 @@ public: double fStep, double fMax, sal_uInt16 nPossDir); - virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg + virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, bool bUnGroup = false, bool bRows = true); - virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, //add for ScInsertCellDlg + virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, int nId, sal_Bool bDisallowCellMove = false ); - virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, //add for ScInsertContentsDlg + virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, int nId, sal_uInt16 nCheckDefaults = 0, const OUString* pStrTitle = NULL ); @@ -466,12 +464,12 @@ public: virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile); - virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg + virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, const std::vector<String> &rEntryList ); - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent); //add for ScLinkedAreaDlg + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent); - virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg + virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, sal_uInt16 nResId, // Ableitung fuer jeden Dialog! long nCurrent, long nDefault, @@ -489,9 +487,9 @@ public: virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, sal_uInt16 nFlags); - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ); //add for ScNamePasteDlg + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ); - virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, //add for ScPivotFilterDlg + virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ); virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, @@ -520,26 +518,26 @@ public: ScDPObject& rDPObj, sal_uInt16 nOrient ); - virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, //add for ScNewScenarioDlg + virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const String& rName, int nId, sal_Bool bEdit = false, sal_Bool bSheetProtected = false ); - virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ); //add for ScShowTabDlg + virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int nId ); - virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, //add for ScStringInputDlg + virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, const OString& sHelpId, const OString& sEditHelpId, int nId ); - virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, //add for ScStringInputDlg + virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, const String& rTitle, //Dialog Title const String& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color const OString& sHelpId , int nId ); - virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg + virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, int nId, sal_Bool bAscii = sal_True, const ScImportOptions* pOptions = NULL, @@ -547,34 +545,34 @@ public: sal_Bool bMultiByte = false, sal_Bool bOnlyDbtoolsEncodings = false, sal_Bool bImport = sal_True ); - virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, //add for ScAttrDlg + virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, Window* pParent, const SfxItemSet* pCellAttrs ); - virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, //add for ScHFEditDlg + virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId = RID_SCDLG_HFEDIT ); - virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent,//add for ScStyleDlg + virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId); - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, //add for ScSubTotalDlg + virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, const SfxItemSet* pArgSet, int nId); - virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr,//add for ScCharDlg + virtual SfxAbstractTabDialog * CreateScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell, int nId ); - virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ,//add for ScParagraphDlg + virtual SfxAbstractTabDialog * CreateScParagraphDlg( Window* pParent, const SfxItemSet* pAttr , int nId ); - virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg + virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ); - virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg + virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, const SfxItemSet* pArgSet,int nId ); // For TabPage @@ -586,5 +584,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |