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

[Libreoffice Gerrit user]

 sw/source/uibase/uiview/viewstat.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit e01c0d3d64331cfc91e3d7c2cff69e44bade4e32
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Tue Jul 24 19:03:23 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Fri Jul 27 08:23:28 2018 +0200

    tdf#118777: Disable signature line slot if non-text object
    
    in 6.1 only in sw, the functionality ain't there yet in sc
    
    Change-Id: I54f7ec336026013d09ac6262779e7fcbd17c2084
    Reviewed-on: https://gerrit.libreoffice.org/57949
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/57990
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 545ddabc6614e751c807e9d1e1cbf7c617fc4141)
    Reviewed-on: https://gerrit.libreoffice.org/58049
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/uibase/uiview/viewstat.cxx b/sw/source/uibase/uiview/viewstat.cxx
index 73661dca0b1b..04e344d0b10e 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -97,12 +97,18 @@ void SwView::GetState(SfxItemSet &rSet)
                 break;
 
             case SID_INSERT_GRAPHIC:
-            case SID_INSERT_SIGNATURELINE:
                 if( m_pWrtShell->CursorInsideInputField() )
                 {
                     rSet.DisableItem(nWhich);
                 }
                 break;
+            case SID_INSERT_SIGNATURELINE:
+                if( !( m_nSelectionType & SelectionType::Text ||
+                    m_nSelectionType & SelectionType::NumberList ) )
+                {
+                    rSet.DisableItem(nWhich);
+                }
+                break;
             case SID_EDIT_SIGNATURELINE:
             case SID_SIGN_SIGNATURELINE:
                 if (!isSignatureLineSelected())