From f69b5dd07a910dd48e087664e31642af50b5fb9a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 4 Feb 2019 15:23:27 +0000 Subject: weld OSelectLabelDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icbf9f05e69667cb8161942dde84ded6b3fc61138 Reviewed-on: https://gerrit.libreoffice.org/67367 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- extensions/source/propctrlr/formcomponenthandler.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx') 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; } -- cgit