diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 15:34:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-28 19:05:09 +0200 |
| commit | 990ced77a5a8c27d69d40a702b3122850dcb04f0 (patch) | |
| tree | 6fecb21dd2cc9e72349e38232cec4a7fd22566f4 /chart2/source/controller/dialogs/res_DataLabel.cxx | |
| parent | 7f5cc838f055c0b083cca1d90a5b2d00b5a44ad5 (diff) | |
weld NumberFormatDialog
Change-Id: I82f3574142bbcdfba5277a7ad5db82e3a33fdbd8
Reviewed-on: https://gerrit.libreoffice.org/61092
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/source/controller/dialogs/res_DataLabel.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/res_DataLabel.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 547f081e155c..95094b4b8d8a 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -85,7 +85,7 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet& rInAttrs, sal_uInt16 nWhichId, }//end anonymous namespace -DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, vcl::Window* pParent, const SfxItemSet& rInAttrs ) +DataLabelResources::DataLabelResources(VclBuilderContainer* pWindow, weld::Window* pParent, const SfxItemSet& rInAttrs ) : m_pNumberFormatter(nullptr), m_bNumberFormatMixedState(true), @@ -204,12 +204,12 @@ IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void ) aNumberSet.Put( SfxUInt32Item( SID_ATTR_NUMBERFORMAT_VALUE, rnFormatKey )); aNumberSet.Put( SfxBoolItem( SID_ATTR_NUMBERFORMAT_SOURCE, rUseSourceFormat )); - ScopedVclPtrInstance< NumberFormatDialog > aDlg(m_pWindow, aNumberSet); + NumberFormatDialog aDlg(m_pWindow, aNumberSet); if( bPercent ) - aDlg->SetText( m_pFT_NumberFormatForPercent->GetText()); - if( aDlg->Execute() == RET_OK ) + aDlg.set_title(m_pFT_NumberFormatForPercent->GetText()); + if (aDlg.run() == RET_OK) { - const SfxItemSet* pResult = aDlg->GetOutputItemSet(); + const SfxItemSet* pResult = aDlg.GetOutputItemSet(); if( pResult ) { bool bOldSource = rUseSourceFormat; |