[Libreoffice-commits] core.git: cui/source

[Libreoffice Gerrit user]

 cui/source/options/treeopt.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f95d782f3bfebb41f0fbd7967d87800f1f25bd48
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 9 15:28:34 2018 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Sep 9 17:57:23 2018 +0200

    make CreateGeneralTabPage take a TabPageParent
    
    Change-Id: Ie68a2405ed9a00daf519ee56db8e1874b050a82e
    Reviewed-on: https://gerrit.libreoffice.org/60220
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits