diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-20 10:48:36 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-20 11:42:41 +0200 |
| commit | 80c49861b69d731bc7eccda8ea085a2676e7422d (patch) | |
| tree | 9e2951653db1cfe169605cc1901598a36c15f87d /sw/source/filter/ww8/wrtw8nds.cxx | |
| parent | ed11cb1dbada47f0ef2129005583fc23d8a9ac10 (diff) | |
sw: WW8 export: remove WW6 residue in WW8AttributeOutput::Redline()
Change-Id: Ife8b827298bc32ad0c490ebca7f3169dddc1009e
Diffstat (limited to 'sw/source/filter/ww8/wrtw8nds.cxx')
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index cc0bf535e901..608d2b377d18 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2965,25 +2965,26 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline ) if ( pRedline->Next() ) Redline( pRedline->Next() ); - static const sal_uInt16 aSprmIds[ 2 * 2 * 3 ] = - { - // Ids for insert - NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark, // for WW8 - 0x0042, 0x0045, 0x0046, // for WW6 - // Ids for delete - NS_sprm::LN_CFRMarkDel, NS_sprm::LN_CIbstRMarkDel, NS_sprm::LN_CDttmRMarkDel, // for WW8 - 0x0041, 0x0045, 0x0046 // for WW6 + static const sal_uInt16 insSprmIds[ 3 ] = + { + // Ids for insert // for WW8 + NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark, + }; + static const sal_uInt16 delSprmIds[ 3 ] = + { + // Ids for delete // for WW8 + NS_sprm::LN_CFRMarkDel, NS_sprm::LN_CIbstRMarkDel, NS_sprm::LN_CDttmRMarkDel, }; const sal_uInt16* pSprmIds = 0; switch( pRedline->GetType() ) { case nsRedlineType_t::REDLINE_INSERT: - pSprmIds = aSprmIds; + pSprmIds = insSprmIds; break; case nsRedlineType_t::REDLINE_DELETE: - pSprmIds = aSprmIds + (2 * 3); + pSprmIds = delSprmIds; break; case nsRedlineType_t::REDLINE_FORMAT: |