diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-06-16 13:21:38 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-06-16 14:47:07 +0200 |
| commit | ae85b56a9a18657a57fd5033faff34e7ee4ff2f8 (patch) | |
| tree | d62b2af7172b2119637a540ab448e6171aca5af3 | |
| parent | 01bc38ac11fe791474fdffd763534851308d86ab (diff) | |
Import/export RTF_REVISIONS
File -> Properties -> Security -> Record Changes on the UI.
Change-Id: I96d321f407abd33e15a4a133e6723d48efa5bc53
| -rw-r--r-- | sw/qa/extras/rtfexport/data/record-changes.rtf | 3 | ||||
| -rw-r--r-- | sw/qa/extras/rtfexport/rtfexport.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 3 |
4 files changed, 17 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfexport/data/record-changes.rtf b/sw/qa/extras/rtfexport/data/record-changes.rtf new file mode 100644 index 000000000000..c970891a1bfd --- /dev/null +++ b/sw/qa/extras/rtfexport/data/record-changes.rtf @@ -0,0 +1,3 @@ +{\rtf1\revisions +hello +\par } diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx index 0605b82cb18d..7de0a4bdf68a 100644 --- a/sw/qa/extras/rtfexport/rtfexport.cxx +++ b/sw/qa/extras/rtfexport/rtfexport.cxx @@ -66,2 +66,3 @@ public: void testTextframeGradient(); + void testRecordChanges(); @@ -119,2 +120,3 @@ void Test::run() {"textframe-gradient.rtf", &Test::testTextframeGradient}, + {"record-changes.rtf", &Test::testRecordChanges}, }; @@ -586,2 +588,8 @@ void Test::testTextframeGradient() +void Test::testRecordChanges() +{ + // \revisions wasn't imported/exported. + CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(mxComponent, "RecordChanges")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index c98b78020505..a766e348b8ee 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -517,2 +517,5 @@ void RtfExport::ExportDocument_Impl() } + // Record changes? + if (nsRedlineMode_t::REDLINE_ON & mnRedlineMode) + Strm() << OOO_STRING_SVTOOLS_RTF_REVISIONS; // Page description diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a2bf11e53b00..8bd05dc5d2b8 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2657,2 +2657,5 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword) break; + case RTF_REVISIONS: + m_aSettingsTableSprms.set(NS_ooxml::LN_CT_Settings_trackRevisions, RTFValue::Pointer_t(new RTFValue(1))); + break; default: |