diff options
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 8 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index b4dbee9b670d..3cdc325eb32c 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1062,6 +1062,14 @@ void DocxAttributeOutput::RunText( const String& rText, rtl_TextEncoding /*eChar impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt ); m_pSerializer->singleElementNS( XML_w, XML_br, FSEND ); break; + case 0x1E: //non-breaking hyphen + impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt ); + m_pSerializer->singleElementNS( XML_w, XML_noBreakHyphen, FSEND ); + break; + case 0x1F: //soft (on demand) hyphen + impl_WriteRunText( m_pSerializer, nTextToken, pBegin, pIt ); + m_pSerializer->singleElementNS( XML_w, XML_softHyphen, FSEND ); + break; default: if ( *pIt < 0x0020 ) // filter out the control codes { diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index c6f03bbde0ef..37c33365a46a 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -44,8 +44,8 @@ static const sal_Unicode uFtnEdnRef = 0x2; static const sal_Unicode uFtnEdnSep = 0x3; static const sal_Unicode uTab = 0x9; static const sal_Unicode uPgNum = 0x0; -static const sal_Unicode uNoBreakHyphen = 0x1e; -static const sal_Unicode uSoftHyphen = 0x1f; +static const sal_Unicode uNoBreakHyphen = 0x2011; +static const sal_Unicode uSoftHyphen = 0xAD; static const sal_uInt8 cFtnEdnCont = 0x4; static const sal_uInt8 cFieldStart = 0x13; |