svx/source/tbxctrls/tbcontrl.cxx | 8 --------
1 file changed, 8 deletions(-)
New commits:
commit 2d3d55e57b916e19c2c75228f7abeecda52716d6
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 15 09:48:14 2019 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 15 14:33:40 2019 +0100
Resolves: tdf#122700 cannot change shadow color
Change-Id: Iee42beb96ff4d059c685173fdde453981b300b3c
Reviewed-on: https://gerrit.libreoffice.org/66360
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f852d9411311..17131138944d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1608,10 +1608,6 @@ IMPL_LINK(SvxColorWindow, SelectHdl, ValueSet*,
pColorSet, void)
VclPtr<SvxColorWindow> xThis(this);
NamedColor aNamedColor = GetSelectEntryColor(pColorSet);
- /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch()
calls.
- This instance may be deleted in the meantime (i.e. when a dialog is
opened
- while in Dispatch()), accessing members will crash in this case. */
- pColorSet->SetNoSelection();
if ( pColorSet != mpRecentColorSet )
{
@@ -1631,10 +1627,6 @@ IMPL_LINK(SvxColorWindow, SelectHdl, ValueSet*,
pColorSet, void)
IMPL_LINK(ColorWindow, SelectHdl, SvtValueSet*, pColorSet, void)
{
NamedColor aNamedColor = GetSelectEntryColor(pColorSet);
- /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch()
calls.
- This instance may be deleted in the meantime (i.e. when a dialog is
opened
- while in Dispatch()), accessing members will crash in this case. */
- pColorSet->SetNoSelection();
if (pColorSet != mxRecentColorSet.get())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
