Kaydet (Commit) bbe19c13 authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Noel Grandin

tdf#104023 - fix wrong boolean logic for RedlineFlags

commit 847e004e
   convert nsRedlineMode_t to typed_flags

...introduced some logical equivalency errors. A few static
redline functions utilize the correct logic, so use them to
simplify the code readability.

Change-Id: I4f5715b71dd4c8f2a6cea0c816637b1784892c0d
Reviewed-on: https://gerrit.libreoffice.org/30974Reviewed-by: 's avatarJustin Luth <justin_luth@sil.org>
Tested-by: 's avatarJustin Luth <justin_luth@sil.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9be04c6c
...@@ -125,8 +125,7 @@ const SwRangeRedline* SwEditShell::GetCurrRedline() const ...@@ -125,8 +125,7 @@ const SwRangeRedline* SwEditShell::GetCurrRedline() const
void SwEditShell::UpdateRedlineAttr() void SwEditShell::UpdateRedlineAttr()
{ {
if( ( RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ) == if( IDocumentRedlineAccess::IsShowChanges(GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags()) )
( RedlineFlags::ShowMask & GetDoc()->getIDocumentRedlineAccess().GetRedlineFlags() ))
{ {
SET_CURR_SHELL( this ); SET_CURR_SHELL( this );
StartAllAction(); StartAllAction();
......
...@@ -267,8 +267,7 @@ void SwView::GetState(SfxItemSet &rSet) ...@@ -267,8 +267,7 @@ void SwView::GetState(SfxItemSet &rSet)
break; break;
case FN_REDLINE_SHOW: case FN_REDLINE_SHOW:
{ {
RedlineFlags nMask = RedlineFlags::ShowInsert | RedlineFlags::ShowDelete; rSet.Put( SfxBoolItem( nWhich, IDocumentRedlineAccess::IsShowChanges(m_pWrtShell->GetRedlineFlags()) ));
rSet.Put( SfxBoolItem( nWhich, bool(m_pWrtShell->GetRedlineFlags() & nMask) ));
} }
break; break;
case SID_AVMEDIA_PLAYER : case SID_AVMEDIA_PLAYER :
......
...@@ -2031,8 +2031,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) ...@@ -2031,8 +2031,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
bool bSet = false; bool bSet = false;
if(WID_DOC_CHANGES_SHOW == pEntry->nWID) if(WID_DOC_CHANGES_SHOW == pEntry->nWID)
{ {
const RedlineFlags nMask = RedlineFlags::ShowInsert | RedlineFlags::ShowDelete; bSet = IDocumentRedlineAccess::IsShowChanges(eMode);
bSet = bool(eMode & nMask);
} }
else if(WID_DOC_CHANGES_RECORD == pEntry->nWID) else if(WID_DOC_CHANGES_RECORD == pEntry->nWID)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment