diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-05 09:11:58 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-05 09:11:58 +0200 |
| commit | 4921b03d9c0e0fa275d2933947f74844e5526382 (patch) | |
| tree | 7e4ff220058c93980f5bd28935d910fafcd7695b /sw/source | |
| parent | 0e30cae512f91bc7b92b214e3c9760a38d873026 (diff) | |
sw: don't hardcode sprmCCvUl (underline color)
Change-Id: Ie7eefcadc0344654dd0b57bda0363b6f6f7aceec
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/sprmids.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/sprmids.hxx b/sw/source/filter/ww8/sprmids.hxx index dcc55e642deb..3d58ab545115 100644 --- a/sw/source/filter/ww8/sprmids.hxx +++ b/sw/source/filter/ww8/sprmids.hxx @@ -310,6 +310,7 @@ const sal_uInt16 LN_TDxaFromTextRight = 0x941e; const sal_uInt16 LN_TDyaFromTextBottom = 0x941f; const sal_uInt16 LN_TFNoAllowOverlap = 0x3465; const sal_uInt16 LN_CCv = 0x6870; +const sal_uInt16 LN_CCvUl = 0x6877; } #endif // INCLUDED_SW_SOURCE_FILTER_WW8_SPRMIDS_HXX diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 6d02ea30868f..deb5d121c0ae 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1272,7 +1272,7 @@ void WW8AttributeOutput::CharUnderline( const SvxUnderlineItem& rUnderline ) Color aColor = rUnderline.GetColor(); if( aColor != COL_TRANSPARENT ) { - m_rWW8Export.InsUInt16( 0x6877 ); + m_rWW8Export.InsUInt16( NS_sprm::LN_CCvUl ); m_rWW8Export.InsUInt32( wwUtility::RGBToBGR( aColor.GetColor() ) ); } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 4f82a464c1de..e21876d0d7bb 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -6134,7 +6134,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher() {0x6815, 0}, //undocumented {0x6816, 0}, //undocumented {NS_sprm::LN_CCv, &SwWW8ImplReader::Read_TextForeColor}, - {0x6877, &SwWW8ImplReader::Read_UnderlineColor}, + {NS_sprm::LN_CCvUl, &SwWW8ImplReader::Read_UnderlineColor}, {0xC64D, &SwWW8ImplReader::Read_ParaBackColor}, {0x6467, 0}, //undocumented {0xF617, 0}, //undocumented |