commit fcee6b02ebfcb82f3c191b1e6ef12ef9a3487711
author Andreas Heinisch <andreas.heinisch@yahoo.de> Fri Nov 26 14:10:28 2021 +0100
committer Andreas Heinisch <andreas.heinisch@yahoo.de> Fri Nov 26 21:58:47 2021 +0100
tree b24124f4b59d4073b0bcdb50ad3eea78b614bf4b
parent 324e5c3942870749fae0e62c1c11a1400b772584

tdf#118063 - Writer: Deselected line spacing items remained checked

The state of the attributes for line spacing within comments and
textboxes are now read and set correctly.

Line spacing menu items were removed from Calc in Bug 136071
(ce9e965b3fc3744b99afee07f6d56860852af5e4).

Change-Id: Ie20a8529d84a14d549e1985471f684b88e21819b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125880
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>

sw/source/uibase/shells/annotsh.cxx

diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index ec0cf29..0a79872 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -774,7 +774,10 @@ void SwAnnotationShell::GetState(SfxItemSet& rSet)
                        if( nLSpace == static_cast<const SvxLineSpacingItem*>(pLSpace)->GetPropLineSpace() )
                            rSet.Put( SfxBoolItem( nWhich, true ));
                        else
                            rSet.InvalidateItem( nWhich );
                        {
                            // tdf#114631 - disable non selected line spacing
                            rSet.Put(SfxBoolItem(nWhich, false));
                        }
                    }
                    break;
                }

sw/source/uibase/shells/drwtxtex.cxx

diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 3f7a1e5..e94dbae 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -814,7 +814,11 @@ void SwDrawTextShell::GetState(SfxItemSet& rSet)
                         == static_cast<const SvxLineSpacingItem*>(pLSpace)->GetPropLineSpace())
                    bFlag = true;
                else
                {
                    // tdf#114631 - disable non selected line spacing
                    rSet.Put(SfxBoolItem(nWhich, false));
                    nSlotId = 0;
                }
            }
            break;