Skip to content

C
core
Kaydet (Commit) 80c49861 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

sw: WW8 export: remove WW6 residue in WW8AttributeOutput::Redline() 

Change-Id: Ife8b827298bc32ad0c490ebca7f3169dddc1009e
üst ed11cb1d
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 10 deletions
sw/source/filter/ww8/wrtw8nds.cxx
Dosyayı görüntüle @ 80c49861
...@@ -2965,25 +2965,26 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline ) ...@@ -2965,25 +2965,26 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline )
if ( pRedline->Next() ) if ( pRedline->Next() )
Redline( pRedline->Next() ); Redline( pRedline->Next() );
static const sal_uInt16 aSprmIds[ 2 * 2 * 3 ] = static const sal_uInt16 insSprmIds[ 3 ] =
{ {
// Ids for insert // Ids for insert // for WW8
NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark, // for WW8 NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark,
0x0042, 0x0045, 0x0046, // for WW6 };
// Ids for delete static const sal_uInt16 delSprmIds[ 3 ] =
NS_sprm::LN_CFRMarkDel, NS_sprm::LN_CIbstRMarkDel, NS_sprm::LN_CDttmRMarkDel, // for WW8 {
0x0041, 0x0045, 0x0046 // for WW6 // Ids for delete // for WW8
NS_sprm::LN_CFRMarkDel, NS_sprm::LN_CIbstRMarkDel, NS_sprm::LN_CDttmRMarkDel,
}; };
const sal_uInt16* pSprmIds = 0; const sal_uInt16* pSprmIds = 0;
switch( pRedline->GetType() ) switch( pRedline->GetType() )
{ {
case nsRedlineType_t::REDLINE_INSERT: case nsRedlineType_t::REDLINE_INSERT:
pSprmIds = aSprmIds; pSprmIds = insSprmIds;
break; break;
case nsRedlineType_t::REDLINE_DELETE: case nsRedlineType_t::REDLINE_DELETE:
pSprmIds = aSprmIds + (2 * 3); pSprmIds = delSprmIds;
break; break;
case nsRedlineType_t::REDLINE_FORMAT: case nsRedlineType_t::REDLINE_FORMAT:
......
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