diff options
| -rw-r--r-- | include/filter/msfilter/sprmids.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/include/filter/msfilter/sprmids.hxx b/include/filter/msfilter/sprmids.hxx index 85c97a0c620a..d632ab91d7ca 100644 --- a/include/filter/msfilter/sprmids.hxx +++ b/include/filter/msfilter/sprmids.hxx @@ -298,6 +298,7 @@ namespace NS_sprm { const sal_uInt16 LN_TDxaFromTextRight = 0x941e; const sal_uInt16 LN_TDyaFromTextBottom = 0x941f; const sal_uInt16 LN_TFNoAllowOverlap = 0x3465; + const sal_uInt16 LN_CCv = 0x6870; } #endif // INCLUDED_SPRMIDS diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index a39f00a73b15..5e43c777e532 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1604,7 +1604,7 @@ void WW8AttributeOutput::CharColor( const SvxColorItem& rColor ) if ( m_rWW8Export.bWrtWW8 && nColor ) { - m_rWW8Export.InsUInt16( 0x6870 ); + m_rWW8Export.InsUInt16( NS_sprm::LN_CCv ); m_rWW8Export.InsUInt32( wwUtility::RGBToBGR( rColor.GetValue().GetColor() ) ); } } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index b0ce585a64ee..e808c5a25e8e 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -3286,7 +3286,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData void SwWW8ImplReader::Read_TxtColor( sal_uInt16, const sal_uInt8* pData, short nLen ) { //Has newer colour varient, ignore this old varient - if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(0x6870)) + if (!bVer67 && pPlcxMan && pPlcxMan->GetChpPLCF()->HasSprm(NS_sprm::LN_CCv)) return; if( nLen < 0 ) @@ -6108,7 +6108,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher() // subtable "sprmPFTtp" {0x6815, 0}, //undocumented {0x6816, 0}, //undocumented - {0x6870, &SwWW8ImplReader::Read_TxtForeColor}, + {NS_sprm::LN_CCv, &SwWW8ImplReader::Read_TxtForeColor}, {0x6877, &SwWW8ImplReader::Read_UnderlineColor}, {0xC64D, &SwWW8ImplReader::Read_ParaBackColor}, {0x6467, 0}, //undocumented diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index c5830fb188be..725843b601df 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -761,7 +761,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {0x9410, 2, L_FIX}, // undocumented {0x6815, 4, L_FIX}, // undocumented {0x6816, 4, L_FIX}, // undocumented - {0x6870, 4, L_FIX}, // undocumented, text colour + {NS_sprm::LN_CCv, 4, L_FIX}, // text colour {0xC64D, 0, L_VAR}, // undocumented, para back colour {0x6467, 4, L_FIX}, // undocumented {0x646B, 4, L_FIX}, // undocumented |