From a27eb931c22313d4dd5c73b35358c0532d20b79e Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Fri, 8 Sep 2017 12:02:51 +0200
Subject: EPUB export: fix double escaped NBSP

The EPUB package interface already XML-escapes characters, avoid a double
escape.

And once that works, handle NBSP/tabs.

Change-Id: I8b7bbdc2592096bdd46fbdb29b48b723ef5cf990
Reviewed-on: https://gerrit.libreoffice.org/42098
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
---
 writerperfect/source/writer/exp/txtparai.cxx | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'writerperfect/source/writer/exp')

diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index b085537cf106..e660a34b1e30 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -152,6 +152,48 @@ void XMLLineBreakContext::startElement(const OUString &/*rName*/, const css::uno
     mrImport.GetGenerator().insertLineBreak();
 }
 
+/// Handler for <text:s>.
+class XMLSpaceContext : public XMLImportContext
+{
+public:
+    XMLSpaceContext(XMLImport &rImport);
+
+    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+};
+
+XMLSpaceContext::XMLSpaceContext(XMLImport &rImport)
+    : XMLImportContext(rImport)
+{
+}
+
+void XMLSpaceContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+{
+    mrImport.GetGenerator().openSpan(librevenge::RVNGPropertyList());
+    mrImport.GetGenerator().insertSpace();
+    mrImport.GetGenerator().closeSpan();
+}
+
+/// Handler for <text:tab>.
+class XMLTabContext : public XMLImportContext
+{
+public:
+    XMLTabContext(XMLImport &rImport);
+
+    void SAL_CALL startElement(const OUString &rName, const css::uno::Reference<css::xml::sax::XAttributeList> &xAttribs) override;
+};
+
+XMLTabContext::XMLTabContext(XMLImport &rImport)
+    : XMLImportContext(rImport)
+{
+}
+
+void XMLTabContext::startElement(const OUString &/*rName*/, const css::uno::Reference<css::xml::sax::XAttributeList> &/*xAttribs*/)
+{
+    mrImport.GetGenerator().openSpan(librevenge::RVNGPropertyList());
+    mrImport.GetGenerator().insertTab();
+    mrImport.GetGenerator().closeSpan();
+}
+
 /// Handler for <text:a>.
 class XMLHyperlinkContext : public XMLImportContext
 {
@@ -255,6 +297,10 @@ XMLImportContext *CreateChildContext(XMLImport &rImport, const OUString &rName)
 {
     if (rName == "text:line-break")
         return new XMLLineBreakContext(rImport);
+    if (rName == "text:s")
+        return new XMLSpaceContext(rImport);
+    if (rName == "text:tab")
+        return new XMLTabContext(rImport);
     return nullptr;
 }
 
-- 
cgit v1.2.3