diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-20 14:15:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-06-21 09:59:39 +0200 |
| commit | 649be5feb4e162f83e9ff5fc8a68b463e723bc07 (patch) | |
| tree | 30ed9e92936bfa51ec376e438fabccc55facff0c /extensions | |
| parent | 1d48e998ae038263b092e0de71da97fceee299f4 (diff) | |
move SvColorDialog to welded arguments
Change-Id: Ieb04fc4684caa6df47b123ab06e280f2d204375a
Reviewed-on: https://gerrit.libreoffice.org/56174
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 06e7cb3d6398..63b56afcbdf0 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2843,11 +2843,12 @@ namespace pcr { ::Color aColor; OSL_VERIFY( impl_getPropertyValue_throw( impl_getPropertyNameFromId_nothrow( _nColorPropertyId ) ) >>= aColor ); - SvColorDialog aColorDlg( impl_getDefaultDialogParent_nothrow() ); + SvColorDialog aColorDlg; aColorDlg.SetColor( aColor ); _rClearBeforeDialog.clear(); - if ( !aColorDlg.Execute() ) + vcl::Window* pParent = impl_getDefaultDialogParent_nothrow(); + if (!aColorDlg.Execute(pParent ? pParent->GetFrameWeld() : nullptr)) return false; _out_rNewValue <<= aColorDlg.GetColor(); |