diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-09 20:43:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-10 16:40:05 +0100 |
| commit | 4dba9820cf44718121a38b3f89eb8caa244d7321 (patch) | |
| tree | 70bd1e02f89742f70b1a542042dd57cacdfc2c4d /svx | |
| parent | 4c9349aef26499b9d80a4d6354680b688a95fb0b (diff) | |
rework tdf#113647 solution to be safe
rather than passing the pointer around, tragic use of uno apis means monstrous
awt::Window thingy has to be passed around and still smuggled through the
dispatch arguments to get through the eye of the XDispatch::dispatch needle
Change-Id: I353f8a3b0bb698bb58f75576e49efd701f3db8bf
Reviewed-on: https://gerrit.libreoffice.org/44585
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/sdi/svx.sdi | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/bulletsnumbering.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 4737b1333dfe..3d684944a963 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -5880,7 +5880,7 @@ SvxOrphansItem Orphan SID_ATTR_PARA_ORPHANS SfxVoidItem OutlineBullet SID_OUTLINE_BULLET -(SfxStringItem Page FN_PARAM_1,SfxStringItem ParentWindow FN_PARAM_2) +(SfxStringItem Page FN_PARAM_1) [ AutoUpdate = FALSE, FastCall = FALSE, diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 42714fae2bbb..8180d18977e3 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -14,6 +14,7 @@ #include <i18nlangtag/mslangid.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/toolbarmenu.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <svx/strings.hrc> #include <svx/dialmgr.hxx> #include <svx/numvset.hxx> @@ -181,7 +182,7 @@ void NumberingPopup::VSSelectHdl(void const * pControl) else if ( getSelectedEntryId() == 1 ) { auto aArgs( comphelper::InitPropertySequence( { { "Page", css::uno::makeAny( OUString("customize") ) }, - { "ParentWindow", css::uno::makeAny( OUString::number(reinterpret_cast<sal_uInt64>(GetParent())) ) } } ) ); + { "DialogParent", css::uno::makeAny(VCLUnoHelper::GetInterface(GetParent())) } } ) ); mrController.dispatchCommand( ".uno:OutlineBullet", aArgs ); } } |