diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-07 13:10:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-08 09:23:40 +0200 |
| commit | 847e004e65ec3c35acff607588d15cd75a84f121 (patch) | |
| tree | 1b2ac62948c9ad15d2f231b56eb45ff341f572f7 /sw/source/uibase/app | |
| parent | 3cac15856ade9fce161a49212c9d1861741122a5 (diff) | |
convert nsRedlineMode_t to typed_flags
including fixing a bug in SwXMLExport::exportDoc where it was ORing with
a constant from a different type: nsRedlineType_t::REDLINE_INSERT
Change-Id: I2bb154c9a35d106e64fd1a8b6e928d0384c9fafe
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index c12ed6c5aeaa..11a48dacb545 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1283,7 +1283,7 @@ bool SwDocShell::IsChangeRecording() const { if (!m_pWrtShell) return false; - return (m_pWrtShell->GetRedlineMode() & nsRedlineMode_t::REDLINE_ON) != 0; + return bool(m_pWrtShell->GetRedlineFlags() & RedlineFlags::On); } bool SwDocShell::HasChangeRecordProtection() const @@ -1295,9 +1295,9 @@ bool SwDocShell::HasChangeRecordProtection() const void SwDocShell::SetChangeRecording( bool bActivate ) { - sal_uInt16 nOn = bActivate ? nsRedlineMode_t::REDLINE_ON : 0; - sal_uInt16 nMode = m_pWrtShell->GetRedlineMode(); - m_pWrtShell->SetRedlineModeAndCheckInsMode( (nMode & ~nsRedlineMode_t::REDLINE_ON) | nOn); + RedlineFlags nOn = bActivate ? RedlineFlags::On : RedlineFlags::NONE; + RedlineFlags nMode = m_pWrtShell->GetRedlineFlags(); + m_pWrtShell->SetRedlineFlagsAndCheckInsMode( (nMode & ~RedlineFlags::On) | nOn ); } void SwDocShell::SetProtectionPassword( const OUString &rNewPassword ) |