[Libreoffice-commits] .: svtools/source

[Caolán McNamara]

 svtools/source/svhtml/htmlout.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 3ea961725a8488082e3741df98cbea358d807c87
Author: Gordon Lack <gordon.lack at dsl.pipex.com>
Date:   Wed May 9 13:51:44 2012 +0100

    Incorrect character written out when saved in HTML format
    
    Change-Id: I0ac19bf724be64004aeaecad67e95627a098975f

diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index d35d4af..54ab173 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -411,10 +411,15 @@ rtl::OString lcl_ConvertCharToHTML( sal_Unicode c,
     switch( c )
     {
     case 0xA0:      // is a hard blank
+        pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp;
+        break;
+// This was labelled as:
 //!! the TextConverter has a problem with this character - so change it to
 // a hard space - that's the same as our 5.2
-    case 0x2011:    // is a hard hyphen
-        pStr = OOO_STRING_SVTOOLS_HTML_S_nbsp;
+//   but that just breaks html output.  Setting the numberic html entity
+//   seems fine.
+    case 0x2011:       // is a hard hyphen
+        pStr = "#8209";
         break;
     case 0xAD:      // is a soft hyphen
         pStr = OOO_STRING_SVTOOLS_HTML_S_shy;