diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-04 15:23:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-04 20:46:00 +0100 |
| commit | f69b5dd07a910dd48e087664e31642af50b5fb9a (patch) | |
| tree | fdd0061b161da59e4de40f1566cc69efc2498140 /extensions/source/propctrlr/formcomponenthandler.cxx | |
| parent | ad5493c3fcbec7dfa41e57ca2f98acbbce739b85 (diff) | |
weld OSelectLabelDialog
Change-Id: Icbf9f05e69667cb8161942dde84ded6b3fc61138
Reviewed-on: https://gerrit.libreoffice.org/67367
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 99ef87995ebc..7dfa51afabcf 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2855,11 +2855,12 @@ namespace pcr bool FormComponentPropertyHandler::impl_dialogChooseLabelControl_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { - ScopedVclPtrInstance< OSelectLabelDialog > dlgSelectLabel( impl_getDefaultDialogParent_nothrow(), m_xComponent ); + vcl::Window* pParent = impl_getDefaultDialogParent_nothrow(); + OSelectLabelDialog dlgSelectLabel(pParent ? pParent->GetFrameWeld() : nullptr, m_xComponent); _rClearBeforeDialog.clear(); - bool bSuccess = ( RET_OK == dlgSelectLabel->Execute() ); + bool bSuccess = (RET_OK == dlgSelectLabel.run()); if ( bSuccess ) - _out_rNewValue <<= dlgSelectLabel->GetSelected(); + _out_rNewValue <<= dlgSelectLabel.GetSelected(); return bSuccess; } |