[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sw/source

[Andreas Heinisch (via logerrit)]

 sw/source/uibase/shells/annotsh.cxx  |    5 ++++-
 sw/source/uibase/shells/drwtxtex.cxx |    4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit b1b83c98512024830af03ab4cfbed3517036c6a1
Author:     Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Fri Nov 26 14:10:28 2021 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Nov 30 10:09:08 2021 +0100

    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.heini...@yahoo.de>
    (cherry picked from commit fcee6b02ebfcb82f3c191b1e6ef12ef9a3487711)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126005
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/uibase/shells/annotsh.cxx 
b/sw/source/uibase/shells/annotsh.cxx
index ec0cf296f81d..0a798724c508 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;
                 }
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index 3f7a1e5e5dad..e94dbae0b0b8 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;