summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarina Behrens <Katarina.Behrens@cib.de>2018-07-24 19:03:23 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2018-07-27 08:23:28 +0200
commite01c0d3d64331cfc91e3d7c2cff69e44bade4e32 (patch)
treee48c24702449ead990c8e996cebf31f9e09e9f94
parent63543c44f2ce1af3b8a1cb350f9d03bc75a54f7d (diff)
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@cib.de> Reviewed-on: https://gerrit.libreoffice.org/57990 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 545ddabc6614e751c807e9d1e1cbf7c617fc4141) Reviewed-on: https://gerrit.libreoffice.org/58049 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--sw/source/uibase/uiview/viewstat.cxx8
1 files changed, 7 insertions, 1 deletions
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())