[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - extensions/source

[Caolán McNamara]

 extensions/source/propctrlr/formcomponenthandler.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a28ffcc7b6ea979a3c730ab76a97ecab01f6efb6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 2 17:11:40 2013 +0100

    Resolves: fdo#66252 format->number for controls is busted
    
    Change-Id: I7c88f3acd9a6c5faa40a8fedc7c9f6e7817cefb7
    (cherry picked from commit 092281f1e7022ee26e3659cc1c54ac0dd73a4382)
    Reviewed-on: https://gerrit.libreoffice.org/4682
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index b91055f..efd3899 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2717,20 +2717,20 @@ namespace pcr
             aCoreSet.Put( aFormatter );
 
             // a tab dialog with a single page
-            ::std::auto_ptr< SfxNoLayoutSingleTabDialog > pDialog( new SfxNoLayoutSingleTabDialog( impl_getDefaultDialogParent_nothrow(), aCoreSet, 0 ) );
+            boost::scoped_ptr< SfxSingleTabDialog > xDialog(new SfxSingleTabDialog(impl_getDefaultDialogParent_nothrow(), aCoreSet));
             SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
             DBG_ASSERT( pFact, "CreateFactory fail!" );
             ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
             if ( !fnCreatePage )
                 throw RuntimeException();   // caught below
 
-            SfxTabPage* pPage = (*fnCreatePage)( pDialog.get(), aCoreSet );
-            pDialog->SetTabPage( pPage );
+            SfxTabPage* pPage = (*fnCreatePage)( xDialog->get_content_area(), aCoreSet );
+            xDialog->setTabPage( pPage );
 
             _rClearBeforeDialog.clear();
-            if ( RET_OK == pDialog->Execute() )
+            if ( RET_OK == xDialog->Execute() )
             {
-                const SfxItemSet* pResult = pDialog->GetOutputItemSet();
+                const SfxItemSet* pResult = xDialog->GetOutputItemSet();
 
                 const SfxPoolItem* pItem = pResult->GetItem( SID_ATTR_NUMBERFORMAT_INFO );
                 const SvxNumberInfoItem* pInfoItem = dynamic_cast< const SvxNumberInfoItem* >( pItem );