diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-11 14:30:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-11 14:37:11 +0100 |
| commit | 47ab3749bf096e577fc9568cb404c7e1bc08aca3 (patch) | |
| tree | 34f8e6b67370367e92ef7983d73a9fc109c691c0 /sw | |
| parent | 5b8fd39d3bd319ed760ebdcbb0cbef868ec5a2b1 (diff) | |
hardcoded sprmCFELayout
Change-Id: I911c1cdf503c46ace38afc80ec63bb0696d1c84b
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 70e0fe9ba3d1..8094d9d27e3f 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -1507,10 +1507,10 @@ void WW8AttributeOutput::CharRotate( const SvxCharRotateItem& rRotate ) if ( m_rWW8Export.bWrtWW8 && !m_rWW8Export.IsInTable() ) { // #i36867 In word the text in a table is rotated via the TC or NS_sprm::LN_TTextFlow - // This means you can only rotate all or none of the text adding NS_sprm::LN_CEastAsianLayout + // This means you can only rotate all or none of the text adding NS_sprm::LN_CFELayout // here corrupts the table, hence !m_rWW8Export.bIsInTable - m_rWW8Export.InsUInt16( NS_sprm::LN_CEastAsianLayout ); + m_rWW8Export.InsUInt16( NS_sprm::LN_CFELayout ); m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6 m_rWW8Export.pO->push_back( (sal_uInt8)0x01 ); @@ -3351,7 +3351,7 @@ void WW8AttributeOutput::CharTwoLines( const SvxTwoLinesItem& rTwoLines ) if( !m_rWW8Export.bWrtWW8 ) return; - m_rWW8Export.InsUInt16( NS_sprm::LN_CEastAsianLayout ); + m_rWW8Export.InsUInt16( NS_sprm::LN_CFELayout ); m_rWW8Export.pO->push_back( (sal_uInt8)0x06 ); //len 6 m_rWW8Export.pO->push_back( (sal_uInt8)0x02 ); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 1a12a17e61ce..339c3194e3a5 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -6054,7 +6054,7 @@ const wwSprmDispatcher *GetWW8SprmDispatcher() //tap.rgtc[].vertAlign;complex //variable length always //recorded as 3 byte; - {0xCA78, &SwWW8ImplReader::Read_DoubleLine_Rotate}, + {NS_sprm::LN_CFELayout, &SwWW8ImplReader::Read_DoubleLine_Rotate}, {0x6649, 0}, //undocumented {0xF614, 0}, //"sprmTTableWidth" //recorded as 3 bytes; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index e703639418f4..9f7800ec7086 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -727,7 +727,7 @@ const wwSprmSearcher *wwSprmParser::GetWW8SprmSearcher() {0xD62A, 1, L_FIX}, // "sprmTDiagLine" ;;; {0xD62B, 0, L_VAR}, // "sprmTVertMerge" tap.rgtc[].vertMerge {0xD62C, 0, L_VAR}, // "sprmTVertAlign" tap.rgtc[].vertAlign - {0xCA78, 0, L_VAR}, // undocumented "sprmCDoubleLine ?" + {NS_sprm::LN_CFELayout, 0, L_VAR}, {0x6649, 4, L_FIX}, // undocumented {0xF614, 3, L_FIX}, // undocumented {0xD612, 0, L_VAR}, // undocumented, new background colours. |