diff options
| author | heiko tietze <tietze.heiko@gmail.com> | 2018-04-08 12:35:58 +0200 |
|---|---|---|
| committer | Heiko Tietze <tietze.heiko@gmail.com> | 2018-04-10 00:47:22 +0200 |
| commit | 8b34efff7a7ed13553dfe87cd2413d01c76dec1d (patch) | |
| tree | fea585bfae98b6af5270b0aef2491b445c1a2004 /sw/source/uibase/docvw/edtwin2.cxx | |
| parent | c7b8dacab8fafdcf89311f780493a896e7350454 (diff) | |
tdf#114523 Make inline tooltips for changes optional
Revert redline shenanigans from change 46971; option is now set with view
Change-Id: I55fcfef8a40ad621630dfcefed9e50fdafa94005
Reviewed-on: https://gerrit.libreoffice.org/52586
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
Diffstat (limited to 'sw/source/uibase/docvw/edtwin2.cxx')
| -rw-r--r-- | sw/source/uibase/docvw/edtwin2.cxx | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx index 670d9244fa7d..9e4658eacf4a 100644 --- a/sw/source/uibase/docvw/edtwin2.cxx +++ b/sw/source/uibase/docvw/edtwin2.cxx @@ -260,8 +260,13 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) break; case IsAttrAtPos::Redline: - sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon); - break; + { + const bool bShowTrackChanges = IDocumentRedlineAccess::IsShowChanges( m_rView.GetDocShell()->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() ); + const bool bShowInlineTooltips = rSh.GetViewOptions()->IsShowInlineTooltips(); + if ( bShowTrackChanges && bShowInlineTooltips ) + sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon); + } + break; case IsAttrAtPos::ToxMark: sText = aContentAtPos.sStr; @@ -361,9 +366,14 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) if( sText.isEmpty() ) { - aContentAtPos.eContentAtPos = IsAttrAtPos::Redline; - if( rSh.GetContentAtPos( aPos, aContentAtPos, false, &aFieldRect ) ) - sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon); + const bool bShowTrackChanges = IDocumentRedlineAccess::IsShowChanges( m_rView.GetDocShell()->GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() ); + const bool bShowInlineTooltips = rSh.GetViewOptions()->IsShowInlineTooltips(); + if ( bShowTrackChanges && bShowInlineTooltips ) + { + aContentAtPos.eContentAtPos = IsAttrAtPos::Redline; + if( rSh.GetContentAtPos( aPos, aContentAtPos, false, &aFieldRect ) ) + sText = lcl_GetRedlineHelp(*aContentAtPos.aFnd.pRedl, bBalloon); + } } } } |