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

[Libreoffice Gerrit user]

 extensions/source/propctrlr/formcomponenthandler.cxx |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit ee96edf8e17471225eb86a63adc096d0441e9e03
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 12 15:47:12 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 12 20:41:36 2019 +0100

    weld extensions FormatNumberDialog
    
    Change-Id: I34cb3f1739c6c3ee983be6ca0c70051a5fcfcb5d
    Reviewed-on: https://gerrit.libreoffice.org/69115
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index cb1f24166211..fca77a359997 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2671,20 +2671,21 @@ namespace pcr
             aCoreSet.Put( aFormatter );
 
             // a tab dialog with a single page
-            ScopedVclPtrInstance< SfxSingleTabDialog > xDialog( impl_getDefaultDialogParent_nothrow(), aCoreSet,
-                "FormatNumberDialog", "cui/ui/formatnumberdialog.ui");
+            SfxSingleTabDialogController aDialog(impl_getDefaultDialogFrame_nothrow(), aCoreSet,
+                "cui/ui/formatnumberdialog.ui", "FormatNumberDialog");
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
             if ( !fnCreatePage )
                 throw RuntimeException();   // caught below
 
-            VclPtr<SfxTabPage> pPage = (*fnCreatePage)( xDialog->get_content_area(), &aCoreSet );
-            xDialog->SetTabPage( pPage );
+            TabPageParent aParent(aDialog.get_content_area(), &aDialog);
+            VclPtr<SfxTabPage> xPage = (*fnCreatePage)(aParent, &aCoreSet);
+            aDialog.SetTabPage(xPage);
 
             _rClearBeforeDialog.clear();
-            if ( RET_OK == xDialog->Execute() )
+            if ( RET_OK == aDialog.run() )
             {
-                const SfxItemSet* pResult = xDialog->GetOutputItemSet();
+                const SfxItemSet* pResult = aDialog.GetOutputItemSet();
 
                 const SfxPoolItem* pItem = pResult->GetItem( SID_ATTR_NUMBERFORMAT_INFO );
                 const SvxNumberInfoItem* pInfoItem = dynamic_cast< const SvxNumberInfoItem* >( pItem );