EPUB export: handle cell border size/style/color

By adding support for automatic cell styles.

Change-Id: I31ff2bb6fed3391f571705505ccbbd89087e5972
Reviewed-on: https://gerrit.libreoffice.org/45201
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

1 files changed, 10 insertions, 17 deletions

diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index 9c649c1d25ec..31df98fe7114 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -17,13 +17,6 @@ using namespace com::sun::star;
 namespace
 {
 
-/// Looks for rName in rAutomaticStyles (and failing that, in rNamedStyles) and
-/// fills rPropertyList based on that.
-void FillStyles(const OUString &rName,
-                std::map<OUString, librevenge::RVNGPropertyList> &rAutomaticStyles,
-                std::map<OUString, librevenge::RVNGPropertyList> &rNamedStyles,
-                librevenge::RVNGPropertyList &rPropertyList);
-
 /// Looks for rName in rStyles and fills rPropertyList based on that
 /// (rAutomaticStyles and rNamedStyles are a list of possible parents).
 void FillStyle(const OUString &rName,
@@ -42,7 +35,7 @@ void FillStyle(const OUString &rName,
         // Style has a parent.
         OUString aParent = OStringToOUString(rStyle["style:parent-style-name"]->getStr().cstr(), RTL_TEXTENCODING_UTF8);
         if (!aParent.isEmpty())
-            FillStyles(aParent, rAutomaticStyles, rNamedStyles, rPropertyList);
+            writerperfect::exp::FillStyles(aParent, rAutomaticStyles, rNamedStyles, rPropertyList);
     }
 
     // Apply properties from named style.
@@ -54,15 +47,6 @@ void FillStyle(const OUString &rName,
     }
 }
 
-void FillStyles(const OUString &rName,
-                std::map<OUString, librevenge::RVNGPropertyList> &rAutomaticStyles,
-                std::map<OUString, librevenge::RVNGPropertyList> &rNamedStyles,
-                librevenge::RVNGPropertyList &rPropertyList)
-{
-    FillStyle(rName, rAutomaticStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
-    FillStyle(rName, rNamedStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
-}
-
 }
 
 namespace writerperfect
@@ -343,6 +327,15 @@ rtl::Reference<XMLImportContext> CreateParagraphOrSpanChildContext(XMLImport &rI
     return nullptr;
 }
 
+void FillStyles(const OUString &rName,
+                std::map<OUString, librevenge::RVNGPropertyList> &rAutomaticStyles,
+                std::map<OUString, librevenge::RVNGPropertyList> &rNamedStyles,
+                librevenge::RVNGPropertyList &rPropertyList)
+{
+    FillStyle(rName, rAutomaticStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
+    FillStyle(rName, rNamedStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
+}
+
 } // namespace exp
 } // namespace writerperfect