diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 10:56:00 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-10-28 10:56:20 +0100 |
commit | 6dc8f25ecf676a2e4d1a1018b729fef4096df8e7 (patch) | |
tree | 6145d97267c5e18b33e87f833239d792dcee68f4 /sc | |
parent | ec06f95d91341c277d53828323fc0f4f3f8d9570 (diff) |
these need to be VclPtrs
Change-Id: I83616728289e398c97e50f33b5dd1de404deaa27
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/scabstdlg.hxx | 14 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index bd5f5d954224..a3e54faa73b2 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -518,29 +518,29 @@ public: bool bOnlyDbtoolsEncodings = false, bool bImport = true ) = 0; - virtual SfxAbstractTabDialog * CreateScAttrDlg( vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window* pParent, const SfxItemSet* pCellAttrs ) = 0; - virtual SfxAbstractTabDialog * CreateScHFEditDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScHFEditDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId ) = 0; - virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) = 0; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScSubTotalDlg( vcl::Window* pParent, const SfxItemSet* pArgSet ) = 0; - virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0; - virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) = 0; - virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) = 0; + virtual VclPtr<SfxAbstractTabDialog> CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) = 0; // for tabpage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 5f61a0ef0b5e..e6e3a385f6fe 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -857,13 +857,13 @@ AbstractScImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScImportOptions return VclPtr<AbstractScImportOptionsDlg_Impl>::Create( pDlg ); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs) +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScAttrDlg(vcl::Window* pParent, const SfxItemSet* pCellAttrs) { VclPtr<SfxTabDialog> pDlg = VclPtr<ScAttrDlg>::Create(pParent, pCellAttrs); return VclPtr<ScAbstractTabDialog_Impl>::Create(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vcl::Window* pParent, +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId ) @@ -910,7 +910,7 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( vcl::Win return pDlg ? VclPtr<ScAbstractTabDialog_Impl>::Create( pDlg ) : nullptr; } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Window* pParent, +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) @@ -931,27 +931,27 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScStyleDlg( vcl::Wind return nullptr; } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) { VclPtr<SfxTabDialog> pDlg = VclPtr<ScSubTotalDlg>::Create( pParent, pArgSet ); return VclPtr<ScAbstractTabDialog_Impl>::Create( pDlg ); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScCharDlg( +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScCharDlg( vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) { VclPtr<SfxTabDialog> pDlg = VclPtr<ScCharDlg>::Create(pParent, pAttr, pDocShell); return VclPtr<ScAbstractTabDialog_Impl>::Create(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScParagraphDlg( vcl::Window* pParent, const SfxItemSet* pAttr) { VclPtr<SfxTabDialog> pDlg = VclPtr<ScParagraphDlg>::Create(pParent, pAttr); return VclPtr<ScAbstractTabDialog_Impl>::Create(pDlg); } -SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) +VclPtr<SfxAbstractTabDialog> ScAbstractDialogFactory_Impl::CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) { VclPtr<SfxTabDialog> pDlg = VclPtr<ScSortDlg>::Create( pParent, pArgSet ); return VclPtr<ScAbstractTabDialog_Impl>::Create( pDlg ); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index c03bea9f9dc3..d4104b7dbc27 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -532,28 +532,28 @@ public: bool bMultiByte = false, bool bOnlyDbtoolsEncodings = false, bool bImport = true ) override; - virtual SfxAbstractTabDialog * CreateScAttrDlg( vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window* pParent, const SfxItemSet* pCellAttrs ) override; - virtual SfxAbstractTabDialog * CreateScHFEditDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScHFEditDlg(vcl::Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, sal_uInt16 nResId ) override; - virtual SfxAbstractTabDialog * CreateScStyleDlg( vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScStyleDlg( vcl::Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, int nId) override; - virtual SfxAbstractTabDialog * CreateScSubTotalDlg( vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScSubTotalDlg( vcl::Window* pParent, const SfxItemSet* pArgSet ) override; - virtual SfxAbstractTabDialog * CreateScCharDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScCharDlg(vcl::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) override; - virtual SfxAbstractTabDialog * CreateScParagraphDlg(vcl::Window* pParent, + virtual VclPtr<SfxAbstractTabDialog> CreateScParagraphDlg(vcl::Window* pParent, const SfxItemSet* pAttr) override; - virtual SfxAbstractTabDialog * CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) override; + virtual VclPtr<SfxAbstractTabDialog> CreateScSortDlg(vcl::Window* pParent, const SfxItemSet* pArgSet) override; // For TabPage virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) override; |