diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-09 15:28:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-09 17:57:23 +0200 |
| commit | f95d782f3bfebb41f0fbd7967d87800f1f25bd48 (patch) | |
| tree | 6856ea9d5f5f1e192ce249b8b48add30ac7e7155 | |
| parent | b829325fb407250849d9508ed32176b08006dd0a (diff) | |
make CreateGeneralTabPage take a TabPageParent
Change-Id: Ie68a2405ed9a00daf519ee56db8e1874b050a82e
Reviewed-on: https://gerrit.libreoffice.org/60220
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | cui/source/options/treeopt.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 9615d1bc6a28..9452dae091aa 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -279,8 +279,8 @@ void MailMergeCfg_Impl::Notify( const css::uno::Sequence< OUString >& ) { } -//typedef SfxTabPage* (*FNCreateTabPage)( vcl::Window *pParent, const SfxItemSet &rAttrSet ); -VclPtr<SfxTabPage> CreateGeneralTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +//typedef SfxTabPage* (*FNCreateTabPage)(TabPageParent pParent, const SfxItemSet &rAttrSet); +VclPtr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet) { CreateTabPage fnCreate = nullptr; switch(nId) @@ -1054,10 +1054,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pGroupInfo->m_pInItemSet->GetRanges()); } - pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) ); + TabPageParent pPageParent(pTabBox); + + pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pPageParent, *pGroupInfo->m_pInItemSet ) ); if(!pPageInfo->m_pPage && pGroupInfo->m_pModule) - pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, TabPageParent(pTabBox), *pGroupInfo->m_pInItemSet) ); + pPageInfo->m_pPage.disposeAndReset(pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pPageParent, *pGroupInfo->m_pInItemSet)); DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created"); if ( pPageInfo->m_pPage ) |