diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-02 17:11:40 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 16:50:52 +0000 |
| commit | a28ffcc7b6ea979a3c730ab76a97ecab01f6efb6 (patch) | |
| tree | 5ecbc97b37e1ed281bc7150a9d9356015a2bbcdc /extensions | |
| parent | b38a0aacb035ed924084473e57901b09df1c74c9 (diff) | |
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@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index b91055f17076..efd3899de6d8 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 ); |