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/filter/xml/wrtxml.cxx | |
| 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/filter/xml/wrtxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/wrtxml.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx index 64926cfbe805..3c15cc1e4f30 100644 --- a/sw/source/filter/xml/wrtxml.cxx +++ b/sw/source/filter/xml/wrtxml.cxx @@ -181,13 +181,13 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& // save show redline mode ... const OUString sShowChanges("ShowChanges"); - sal_uInt16 nRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); + RedlineFlags nRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); xInfoSet->setPropertyValue( sShowChanges, - makeAny( IDocumentRedlineAccess::IsShowChanges( nRedlineMode ) ) ); + makeAny( IDocumentRedlineAccess::IsShowChanges( nRedlineFlags ) ) ); // ... and hide redlines for export - nRedlineMode &= ~nsRedlineMode_t::REDLINE_SHOW_MASK; - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT; - pDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( nRedlineMode )); + nRedlineFlags &= ~RedlineFlags::ShowMask; + nRedlineFlags |= RedlineFlags::ShowInsert; + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); // Set base URI xInfoSet->setPropertyValue( "BaseURI", makeAny( GetBaseURL() ) ); @@ -400,12 +400,12 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& // restore redline mode aAny = xInfoSet->getPropertyValue( sShowChanges ); - nRedlineMode = pDoc->getIDocumentRedlineAccess().GetRedlineMode(); - nRedlineMode &= ~nsRedlineMode_t::REDLINE_SHOW_MASK; - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_INSERT; + nRedlineFlags = pDoc->getIDocumentRedlineAccess().GetRedlineFlags(); + nRedlineFlags &= ~RedlineFlags::ShowMask; + nRedlineFlags |= RedlineFlags::ShowInsert; if ( *o3tl::doAccess<bool>(aAny) ) - nRedlineMode |= nsRedlineMode_t::REDLINE_SHOW_DELETE; - pDoc->getIDocumentRedlineAccess().SetRedlineMode((RedlineMode_t)( nRedlineMode )); + nRedlineFlags |= RedlineFlags::ShowDelete; + pDoc->getIDocumentRedlineAccess().SetRedlineFlags( nRedlineFlags ); if (xStatusIndicator.is()) { |