Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hi,

See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=ef7cc64
http://cgit.freedesktop.org/libreoffice/core/commit/?id=dfc7c67

Regression from OOo 3.2; backported patch attached.

Thanks,

Miklos
From 45758ccf490fb2aeeae3ff277ef06a7b7e716669 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@suse.cz>
Date: Tue, 24 Apr 2012 12:47:16 +0200
Subject: [PATCH] fdo#38176 fix RTF export of non-breaking
 space/hyphen/optional hyphen

(cherry-picked from commits ef7cc64 and dfc7c67)
---
 sw/source/filter/ww8/rtfexport.cxx |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 195cb8e..0904ac8 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -914,7 +914,15 @@ OString RtfExport::OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding 
eDestEn
     }
     if (pStr) {
         aBuf.append(pStr);
-        aBuf.append(' ');
+        switch (c)
+        {
+            case 0xa0:
+            case 0x1e:
+            case 0x1f:
+                break;
+            default:
+                aBuf.append(' ');
+        }
     }
     return aBuf.makeStringAndClear();
 }
-- 
1.7.7


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.