[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-0' - svx/source

[Libreoffice Gerrit user]

 svx/source/tbxctrls/tbcontrl.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit cb2e8390febc26f60d5e89955f981408141f1ced
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 15 09:48:14 2019 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Jan 15 17:18:48 2019 +0100

    Resolves: tdf#122700 cannot change shadow color
    
    Change-Id: Iee42beb96ff4d059c685173fdde453981b300b3c
    Reviewed-on: https://gerrit.libreoffice.org/66362
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3100fc2b567d..c748507a1fc8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1605,10 +1605,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 )
     {
@@ -1628,10 +1624,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())
     {