diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-09-01 00:02:40 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-09-01 00:04:51 +0300 |
commit | af5a380bc19f599307b3bc524a31c380d456249e (patch) | |
tree | 080374fb416451758983d9408905aa9db0ca6c6f /sd | |
parent | 7bd0adc64b96d523b62ce9dda9e34aedff6b33d4 (diff) |
Remove pointless comments and ASCII art
Change-Id: I387d7b301643f359f2d6a4c5f51a4dd7f5e1c296
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/sdabstdlg.hxx | 32 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.cxx | 115 | ||||
-rw-r--r-- | sd/source/ui/dlg/sddlgfact.hxx | 30 |
3 files changed, 52 insertions, 125 deletions
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index f100c1734d46..28600632a422 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -61,20 +61,20 @@ class TabPage; class ViewShell; class SdCustomShowList; -class AbstractCopyDlg : public VclAbstractDialog //add for CopyDlg +class AbstractCopyDlg : public VclAbstractDialog { public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; }; -class AbstractSdCustomShowDlg : public VclAbstractDialog //add for SdCustomShowDlg +class AbstractSdCustomShowDlg : public VclAbstractDialog { public: virtual sal_Bool IsModified() const = 0; virtual sal_Bool IsCustomShow() const = 0; }; -class AbstractAssistentDlg : public VclAbstractDialog //add for AssistentDlg +class AbstractAssistentDlg : public VclAbstractDialog { public: virtual SfxObjectShellLock GetDocument() = 0; @@ -87,14 +87,14 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword() = 0; }; -class AbstractSdModifyFieldDlg : public VclAbstractDialog //add for SdModifyFieldDlg +class AbstractSdModifyFieldDlg : public VclAbstractDialog { public: virtual SvxFieldData* GetField() = 0; virtual SfxItemSet GetItemSet() = 0; }; -class AbstractSdSnapLineDlg : public VclAbstractDialog //add for SdSnapLineDlg +class AbstractSdSnapLineDlg : public VclAbstractDialog { public: virtual void GetAttr(SfxItemSet& rOutAttrs) = 0; @@ -105,7 +105,7 @@ public: virtual void SetText( const OUString& rStr ) = 0; }; -class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLayerDlg +class AbstractSdInsertLayerDlg : public VclAbstractDialog { public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; @@ -113,13 +113,13 @@ public: virtual void SetHelpId( const OString& rHelpId ) = 0; }; -class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg +class AbstractSdInsertPasteDlg : public VclAbstractDialog { public: virtual sal_Bool IsInsertBefore() const = 0; }; -class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog //add for SdInsertPagesObjsDlg +class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog { public: virtual ::Window* GetWindow() = 0; //this method is added for return a ::Window type pointer @@ -128,7 +128,7 @@ public: virtual sal_Bool IsRemoveUnnessesaryMasterPages() const = 0; }; -class AbstractMorphDlg : public VclAbstractDialog //add for MorphDlg +class AbstractMorphDlg : public VclAbstractDialog { public: virtual void SaveSettings() const = 0; @@ -137,31 +137,31 @@ public: virtual sal_Bool IsOrientationFade() const = 0; }; -class AbstractSdStartPresDlg : public VclAbstractDialog //add for SdStartPresentationDlg +class AbstractSdStartPresDlg : public VclAbstractDialog { public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; }; -class AbstractSdPresLayoutDlg : public VclAbstractDialog //add for SdPresLayoutDlg +class AbstractSdPresLayoutDlg : public VclAbstractDialog { public: virtual void GetAttr(SfxItemSet& rOutAttrs) = 0; }; -class AbstractSdVectorizeDlg : public VclAbstractDialog //add for SdVectorizeDlg +class AbstractSdVectorizeDlg : public VclAbstractDialog { public: virtual const GDIMetaFile& GetGDIMetaFile() const = 0; }; -class AbstractSdPublishingDlg : public VclAbstractDialog //add for SdPublishingDlg +class AbstractSdPublishingDlg : public VclAbstractDialog { public: virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) = 0; }; -class AbstractHeaderFooterDialog : public VclAbstractDialog // add for HeaderFooterDialog +class AbstractHeaderFooterDialog : public VclAbstractDialog { public: virtual void ApplyToAll( TabPage* pPage ) = 0; @@ -201,12 +201,12 @@ public: virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, - SdPage* ) = 0; // add for MasterLayoutDialog + SdPage* ) = 0; virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, - SdPage* pCurrentPage ) = 0; // add for HeaderFooterDialog + SdPage* pCurrentPage ) = 0; virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc() = 0; virtual CreateTabPage GetSdPrintOptionsTabPageCreatorFunc() = 0; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index ee0154eb7caf..85d26822751f 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -68,25 +68,21 @@ IMPL_ABSTDLG_BASE(AbstractSdPublishingDlg_Impl); IMPL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl); IMPL_ABSTDLG_BASE(AbstractBulletDialog_Impl); -//AbstractCopyDlg_Impl begin void AbstractCopyDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -// AbstractCopyDlg_Impl end -//AbstractSdCustomShowDlg_Impl begin sal_Bool AbstractSdCustomShowDlg_Impl::IsModified() const { return pDlg->IsModified(); } + sal_Bool AbstractSdCustomShowDlg_Impl::IsCustomShow() const { return pDlg->IsCustomShow(); } -// AbstractSdCustomShowDlg_Impl end -// SdAbstractTabDialog_Impl begin void SdAbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId ) { pDlg->SetCurPageId( nId ); @@ -101,28 +97,28 @@ const SfxItemSet* SdAbstractTabDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } + const sal_uInt16* SdAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return pDlg->GetInputRanges( pItem ); } + void SdAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { pDlg->SetInputSet( pInSet ); } + //From class Window. void SdAbstractTabDialog_Impl::SetText( const OUString& rStr ) { pDlg->SetText( rStr ); } + OUString SdAbstractTabDialog_Impl::GetText() const { return pDlg->GetText(); } -//add for SdAbstractTabDialog_Impl end -// -------------------------------------------------------------------- - -// AbstractBulletDialog_Impl begin void AbstractBulletDialog_Impl::SetCurPageId( sal_uInt16 nId ) { static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetCurPageId( nId ); @@ -137,26 +133,26 @@ const SfxItemSet* AbstractBulletDialog_Impl::GetOutputItemSet() const { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetOutputItemSet(); } + const sal_uInt16* AbstractBulletDialog_Impl::GetInputRanges(const SfxItemPool& pItem ) { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetInputRanges( pItem ); } + void AbstractBulletDialog_Impl::SetInputSet( const SfxItemSet* pInSet ) { static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetInputSet( pInSet ); } -//From class Window. + void AbstractBulletDialog_Impl::SetText( const OUString& rStr ) { static_cast< ::sd::OutlineBulletDlg*>(pDlg)->SetText( rStr ); } + OUString AbstractBulletDialog_Impl::GetText() const { return static_cast< ::sd::OutlineBulletDlg*>(pDlg)->GetText(); } -//add for AbstractBulletDialog_Impl end - -// -------------------------------------------------------------------- void SdPresLayoutTemplateDlg_Impl::SetCurPageId( sal_uInt16 nId ) { @@ -193,96 +189,96 @@ OUString SdPresLayoutTemplateDlg_Impl::GetText() const return pDlg->GetText(); } -// -------------------------------------------------------------------- - -//AbstractAssistentDlg_Impl begin SfxObjectShellLock AbstractAssistentDlg_Impl::GetDocument() { return pDlg->GetDocument(); } + OutputType AbstractAssistentDlg_Impl::GetOutputMedium() const { return pDlg->GetOutputMedium(); } + sal_Bool AbstractAssistentDlg_Impl::IsSummary() const { return pDlg->IsSummary(); } + StartType AbstractAssistentDlg_Impl::GetStartType() const { return pDlg->GetStartType(); } + OUString AbstractAssistentDlg_Impl::GetDocPath() const { return pDlg->GetDocPath(); } + sal_Bool AbstractAssistentDlg_Impl::GetStartWithFlag() const { return pDlg->GetStartWithFlag(); } + sal_Bool AbstractAssistentDlg_Impl::IsDocEmpty() const { return pDlg->IsDocEmpty(); } + com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > AbstractAssistentDlg_Impl::GetPassword() { return pDlg->GetPassword(); } -// AbstractAssistentDlg_Impl end -//AbstractSdModifyFieldDlg_Impl begin SvxFieldData* AbstractSdModifyFieldDlg_Impl::GetField() { return pDlg->GetField(); } + SfxItemSet AbstractSdModifyFieldDlg_Impl::GetItemSet() { return pDlg->GetItemSet(); } -// AbstractSdModifyFieldDlg_Impl end -//AbstractSdSnapLineDlg_Impl begin void AbstractSdSnapLineDlg_Impl::GetAttr(SfxItemSet& rOutAttrs) { pDlg->GetAttr(rOutAttrs); } + void AbstractSdSnapLineDlg_Impl::HideRadioGroup() { pDlg->HideRadioGroup(); } + void AbstractSdSnapLineDlg_Impl::HideDeleteBtn() { pDlg->HideDeleteBtn(); } + void AbstractSdSnapLineDlg_Impl::SetInputFields(sal_Bool bEnableX, sal_Bool bEnableY) { pDlg->SetInputFields(bEnableX, bEnableY); } + void AbstractSdSnapLineDlg_Impl::SetText( const OUString& rStr ) { pDlg->SetText( rStr ); } -// AbstractSdSnapLineDlg_Impl end -//AbstractSdInsertLayerDlg_Impl begin void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } + void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId ) { pDlg->SetHelpId( rHelpId ); } -// AbstractSdInsertLayerDlg_Impl end -//AbstractSdInsertPasteDlg_Impl begin sal_Bool AbstractSdInsertPasteDlg_Impl::IsInsertBefore() const { return pDlg->IsInsertBefore(); } -// AbstractSdInsertPasteDlg_Impl end -//AbstractSdInsertPagesObjsDlg_Impl begin ::Window* AbstractSdInsertPagesObjsDlg_Impl::GetWindow() { return (::Window*)pDlg; @@ -297,75 +293,67 @@ sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsLink() { return pDlg->IsLink(); } + sal_Bool AbstractSdInsertPagesObjsDlg_Impl::IsRemoveUnnessesaryMasterPages() const { return pDlg->IsRemoveUnnessesaryMasterPages(); } -// AbstractSdInsertPagesObjsDlg_Impl end -//AbstractMorphDlg_Impl begin void AbstractMorphDlg_Impl::SaveSettings() const { pDlg->SaveSettings(); } + sal_uInt16 AbstractMorphDlg_Impl::GetFadeSteps() const { return pDlg->GetFadeSteps(); } + sal_Bool AbstractMorphDlg_Impl::IsAttributeFade() const { return pDlg->IsAttributeFade(); } + sal_Bool AbstractMorphDlg_Impl::IsOrientationFade() const { return pDlg->IsOrientationFade(); } -// AbstractMorphDlg_Impl end -//AbstractSdStartPresDlg_Impl begin void AbstractSdStartPresDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -//AbstractSdPresLayoutDlg_Impl begin void AbstractSdPresLayoutDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -// AbstractSdPresLayoutDlg_Impl end -//SfxAbstractDialog_Impl begin const SfxItemSet* SdAbstractSfxDialog_Impl::GetOutputItemSet() const { return pDlg->GetOutputItemSet(); } + void SdAbstractSfxDialog_Impl::SetText( const OUString& rStr ) { pDlg->SetText( rStr ); } + OUString SdAbstractSfxDialog_Impl::GetText() const { return pDlg->GetText(); } -//AbstractSfxNoLayoutSingleTabDialog_Impl end - -//AbstractSdVectorizeDlg_Impl begin const GDIMetaFile& AbstractSdVectorizeDlg_Impl::GetGDIMetaFile() const { return pDlg->GetGDIMetaFile(); } -//AbstractSdVectorizeDlg_Impl end -//AbstractSdPublishingDlg_Impl begin void AbstractSdPublishingDlg_Impl::GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ) { pDlg->GetParameterSequence( rParams ); } -//AbstractSdPublishingDlg_Impl end -//AbstractHeaderFooterDialog_Impl void AbstractHeaderFooterDialog_Impl::ApplyToAll( TabPage* pPage ) { pDlg->ApplyToAll( pPage ); @@ -380,102 +368,77 @@ void AbstractHeaderFooterDialog_Impl::Cancel( TabPage* pPage ) { pDlg->Cancel( pPage ); } -//AbstractHeaderFooterDialog_Impl //-------------- SdAbstractDialogFactory implementation-------------- -//add for BreakDlg begin VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateBreakDlg( ::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, - sal_uLong nObjCount ) //add for BreakDlg + sal_uLong nObjCount ) { return new SdVclAbstractDialog_Impl( new ::sd::BreakDlg( pWindow, pDrView, pShell, nSumActionCount, nObjCount ) ); } -//add for BreakDlg end -//add for CopyDlg begin AbstractCopyDlg * SdAbstractDialogFactory_Impl::CreateCopyDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, - ::sd::View* pView ) //add for CopyDlg + ::sd::View* pView ) { return new AbstractCopyDlg_Impl( new ::sd::CopyDlg( pWindow, rInAttrs, pColTab, pView ) ); } -//add for CopyDlg end -//add for SdCustomShowDlg begin -AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) //add for SdCustomShowDlg +AbstractSdCustomShowDlg * SdAbstractDialogFactory_Impl::CreateSdCustomShowDlg( ::Window* pWindow, SdDrawDocument& rDrawDoc ) { return new AbstractSdCustomShowDlg_Impl( new SdCustomShowDlg( pWindow, rDrawDoc ) ); } -//add for SdCustomShowDlg end -// add for SdCharDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabCharDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell ) { return new SdAbstractTabDialog_Impl( new SdCharDlg( pParent, pAttr, pDocShell ) ); } - SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabPageDialog( ::Window* pParent, const SfxItemSet* pAttr, SfxObjectShell* pDocShell, sal_Bool bAreaPage ) { return new SdAbstractTabDialog_Impl( new SdPageDlg( pDocShell, pParent, pAttr, bAreaPage ) ); } -// add for SdCharDlg end -//add for AssistentDlg begin AbstractAssistentDlg * SdAbstractDialogFactory_Impl::CreateAssistentDlg( ::Window* pParent, sal_Bool bAutoPilot) { return new AbstractAssistentDlg_Impl( new AssistentDlg( pParent, bAutoPilot ) ); } -//add for AssistentDlg end -//add for SdModifyFieldDlg begin AbstractSdModifyFieldDlg * SdAbstractDialogFactory_Impl::CreateSdModifyFieldDlg( ::Window* pWindow, const SvxFieldData* pInField, const SfxItemSet& rSet ) { return new AbstractSdModifyFieldDlg_Impl( new SdModifyFieldDlg( pWindow, pInField, rSet ) ); } -//add for SdModifyFieldDlg end -//add for SdSnapLineDlg begin AbstractSdSnapLineDlg * SdAbstractDialogFactory_Impl::CreateSdSnapLineDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View* pView) { return new AbstractSdSnapLineDlg_Impl( new SdSnapLineDlg( pWindow, rInAttrs, pView ) ); } -//add for SdSnapLineDlg end -//add for SdInsertLayerDlg begin -AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) //add for SdInsertLayerDlg +AbstractSdInsertLayerDlg * SdAbstractDialogFactory_Impl::CreateSdInsertLayerDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, bool bDeletable, const OUString& aStr ) { return new AbstractSdInsertLayerDlg_Impl( new SdInsertLayerDlg( pWindow, rInAttrs, bDeletable, aStr ) ); } -//add for SdInsertLayerDlg end -//add for SdInsertPasteDlg begin AbstractSdInsertPasteDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPasteDlg( ::Window* pWindow ) { return new AbstractSdInsertPasteDlg_Impl( new SdInsertPasteDlg( pWindow ) ); } -//add for SdInsertPasteDlg end -//add for SdInsertPagesObjsDlg begin AbstractSdInsertPagesObjsDlg * SdAbstractDialogFactory_Impl::CreateSdInsertPagesObjsDlg( ::Window* pParent, const SdDrawDocument* pDoc, SfxMedium* pSfxMedium, const OUString& rFileName ) { return new AbstractSdInsertPagesObjsDlg_Impl( new SdInsertPagesObjsDlg( pParent, pDoc, pSfxMedium, rFileName ) ); } -//add for SdInsertPagesObjsDlg end -//add for MorphDlg begin AbstractMorphDlg * SdAbstractDialogFactory_Impl::CreateMorphDlg( ::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2) { return new AbstractMorphDlg_Impl( new ::sd::MorphDlg( pParent, pObj1, pObj2 ) ); } -//add for MorphDlg end -// add for OutlineBulletDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdOutlineBulletTabDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { return new AbstractBulletDialog_Impl( new ::sd::OutlineBulletDlg( pParent, pAttr, pView ) ); @@ -485,61 +448,47 @@ SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdParagraphTabDlg( : { return new SdAbstractTabDialog_Impl( new SdParagraphDlg( pParent, pAttr ) ); } -// add for OutlineBulletDlg end -// add for SdStartPresentationDlg begin AbstractSdStartPresDlg * SdAbstractDialogFactory_Impl::CreateSdStartPresentationDlg( ::Window* pWindow, const SfxItemSet& rInAttrs, const std::vector<OUString> &rPageNames, SdCustomShowList* pCSList ) { return new AbstractSdStartPresDlg_Impl( new SdStartPresentationDlg( pWindow, rInAttrs, rPageNames, pCSList ) ); } -// add for SdStartPresentationDlg end -// add for SdRemoteDlg begin VclAbstractDialog * SdAbstractDialogFactory_Impl::CreateRemoteDialog( ::Window* pWindow ) { return new SdVclAbstractDialog_Impl( new ::sd::RemoteDialog( pWindow ) ); } -// add for SdRemoteDlg end -// add for SdPresLayoutTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, ::Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ) { return new SdPresLayoutTemplateDlg_Impl( new SdPresLayoutTemplateDlg( pDocSh, pParent, DlgId, rStyleBase, ePO, pSSPool ) ); } -// add for SdPresLayoutDlg begin AbstractSdPresLayoutDlg * SdAbstractDialogFactory_Impl::CreateSdPresLayoutDlg( ::sd::DrawDocShell* pDocShell, ::Window* pWindow, const SfxItemSet& rInAttrs) { return new AbstractSdPresLayoutDlg_Impl( new SdPresLayoutDlg( pDocShell, pWindow, rInAttrs ) ); } -// add for SdPresLayoutDlg end -// add for SdTabTemplateDlg begin SfxAbstractTabDialog * SdAbstractDialogFactory_Impl::CreateSdTabTemplateDlg( ::Window* pParent, const SfxObjectShell* pDocShell, SfxStyleSheetBase& rStyleBase, SdrModel* pModel, SdrView* pView ) { return new SdAbstractTabDialog_Impl( new SdTabTemplateDlg( pParent, pDocShell, rStyleBase, pModel, pView ) ); } -// add for SdTabTemplateDlg end SfxAbstractDialog* SdAbstractDialogFactory_Impl::CreatSdActionDialog( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) { return new SdAbstractSfxDialog_Impl( new SdActionDlg( pParent, pAttr, pView ) ); } -// add for SdVectorizeDlg begin AbstractSdVectorizeDlg * SdAbstractDialogFactory_Impl::CreateSdVectorizeDlg( ::Window* pParent, const Bitmap& rBmp, ::sd::DrawDocShell* pDocShell ) { return new AbstractSdVectorizeDlg_Impl( new SdVectorizeDlg( pParent, rBmp, pDocShell ) ); } -// add for SdVectorizeDlg end -// add for SdPublishingDlg begin AbstractSdPublishingDlg * SdAbstractDialogFactory_Impl::CreateSdPublishingDlg( ::Window* pWindow, DocumentType eDocType) { return new AbstractSdPublishingDlg_Impl( new SdPublishingDlg( pWindow, eDocType ) ); } -// add for SdPublishingDlg end // Factories for TabPages CreateTabPage SdAbstractDialogFactory_Impl::GetSdOptionsContentsTabPageCreatorFunc() diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 63308bae098b..fb3b823d7fb0 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -48,22 +48,19 @@ namespace sd { class OutlineBulletDlg; class HeaderFooterDialog; } -// add for BreakDlg + class Dialog; class SdVclAbstractDialog_Impl : public VclAbstractDialog { DECL_ABSTDLG_BASE(SdVclAbstractDialog_Impl,Dialog) }; -// add for CopyDlg - class AbstractCopyDlg_Impl : public AbstractCopyDlg { DECL_ABSTDLG_BASE(AbstractCopyDlg_Impl,::sd::CopyDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ); }; -// add for SdCustomShowDlg class SdCustomShowDlg; class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg { @@ -72,7 +69,6 @@ class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg virtual sal_Bool IsCustomShow() const ; }; -//add for SdCharDlg begin class SfxTabDialog; class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog { @@ -86,10 +82,7 @@ class SdAbstractTabDialog_Impl : public SfxAbstractTabDialog virtual void SetText( const OUString& rStr ); virtual OUString GetText() const; }; -//add for SdCharDlg end - -//add for OutlineBulletDlg begin class SfxTabDialog; class AbstractBulletDialog_Impl : public SfxAbstractTabDialog { @@ -103,7 +96,6 @@ class AbstractBulletDialog_Impl : public SfxAbstractTabDialog virtual void SetText( const OUString& rStr ); virtual OUString GetText() const; }; -//add for OutlineBulletDlg end class SdPresLayoutTemplateDlg; class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog @@ -119,7 +111,6 @@ class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog virtual OUString GetText() const; }; -// add for AssistentDlg class AssistentDlg; class AbstractAssistentDlg_Impl : public AbstractAssistentDlg { @@ -134,7 +125,6 @@ class AbstractAssistentDlg_Impl : public AbstractAssistentDlg virtual com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > GetPassword(); }; -// add for SdModifyFieldDlg class SdModifyFieldDlg; class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg { @@ -143,7 +133,6 @@ class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg virtual SfxItemSet GetItemSet(); }; -// add for SdSnapLineDlg class SdSnapLineDlg; class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg { @@ -156,7 +145,6 @@ class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg virtual void SetText( const OUString& rStr ); }; -// add for SdInsertLayerDlg class SdInsertLayerDlg; class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg { @@ -166,7 +154,6 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg virtual void SetHelpId( const OString& rHelpId ) ; }; -// add for SdInsertPasteDlg class SdInsertPasteDlg; class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg { @@ -174,18 +161,16 @@ class AbstractSdInsertPasteDlg_Impl : public AbstractSdInsertPasteDlg virtual sal_Bool IsInsertBefore() const; }; -// add for SdInsertPagesObjsDlg class SdInsertPagesObjsDlg; class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg { DECL_ABSTDLG_BASE(AbstractSdInsertPagesObjsDlg_Impl,SdInsertPagesObjsDlg) - virtual ::Window * GetWindow(); //this method is added for return a Window type pointer + virtual ::Window * GetWindow(); virtual std::vector<OUString> GetList ( const sal_uInt16 nType ); virtual sal_Bool IsLink(); virtual sal_Bool IsRemoveUnnessesaryMasterPages() const; }; -// add for MorphDlg class AbstractMorphDlg_Impl : public AbstractMorphDlg { DECL_ABSTDLG_BASE(AbstractMorphDlg_Impl,::sd::MorphDlg) @@ -195,7 +180,6 @@ class AbstractMorphDlg_Impl : public AbstractMorphDlg virtual sal_Bool IsOrientationFade() const ; }; -// add for SdStartPresentationDlg class SdStartPresentationDlg; class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg { @@ -203,7 +187,6 @@ class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg virtual void GetAttr( SfxItemSet& rOutAttrs ); }; -// add for SdPresLayoutDlg class SdPresLayoutDlg; class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg { @@ -211,7 +194,6 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg virtual void GetAttr(SfxItemSet& rOutAttrs); }; -// add for SdActionDlg class SdAbstractSfxDialog_Impl : public SfxAbstractDialog { DECL_ABSTDLG_BASE(SdAbstractSfxDialog_Impl,SfxModalDialog) @@ -220,7 +202,6 @@ class SdAbstractSfxDialog_Impl : public SfxAbstractDialog virtual OUString GetText() const; }; -// add for SdVectorizeDlg class SdVectorizeDlg; class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg { @@ -228,7 +209,6 @@ class AbstractSdVectorizeDlg_Impl :public AbstractSdVectorizeDlg virtual const GDIMetaFile& GetGDIMetaFile() const ; }; -// add for SdPublishingDlg class SdPublishingDlg; class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg { @@ -236,7 +216,6 @@ class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg virtual void GetParameterSequence( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rParams ); }; -// add for HeaderFooterDialog class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog { DECL_ABSTDLG_BASE(AbstractHeaderFooterDialog_Impl,::sd::HeaderFooterDialog) @@ -244,7 +223,6 @@ class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog virtual void Apply( TabPage* pPage ); virtual void Cancel( TabPage* pPage ); }; -//------------------------------------------------------------------------ //AbstractDialogFactory_Impl implementations class SdAbstractDialogFactory_Impl : public SdAbstractDialogFactory @@ -281,12 +259,12 @@ public: virtual VclAbstractDialog* CreateMasterLayoutDialog( ::Window* pParent, SdDrawDocument* pDoc, - SdPage* ); // add for MasterLayoutDialog + SdPage* ); virtual AbstractHeaderFooterDialog* CreateHeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, - SdPage* pCurrentPage ); // add for HeaderFooterDialog + SdPage* pCurrentPage ); // For TabPage virtual CreateTabPage GetSdOptionsContentsTabPageCreatorFunc(); |