From 092281f1e7022ee26e3659cc1c54ac0dd73a4382 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 2 Jul 2013 17:11:40 +0100 Subject: Resolves: fdo#66252 format->number for controls is busted Change-Id: I7c88f3acd9a6c5faa40a8fedc7c9f6e7817cefb7 --- extensions/source/propctrlr/formcomponenthandler.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'extensions/source') diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index e35dfd7239a2..e29b8920c400 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2716,20 +2716,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 ); -- cgit