Factor out DocxTableStyleExport from DocxAttributeOutput

Also add a docxhelper, that contains stuff that was local to
DocxAttributeOutput till now, but required by DocxTableStyleExport.

Change-Id: I24dcc62d11862078202244c214b317e3bc600567

sw/Library_msword.mk

@@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,msword,\
     sw/source/filter/ww8/docxattributeoutput \
     sw/source/filter/ww8/docxexport \
     sw/source/filter/ww8/docxexportfilter \
+    sw/source/filter/ww8/docxtablestyleexport \
     sw/source/filter/ww8/rtfattributeoutput \
     sw/source/filter/ww8/rtfexport \
     sw/source/filter/ww8/rtfexportfilter \

sw/source/filter/ww8/docxattributeoutput.hxx

@@ -36,6 +36,7 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/optional.hpp>
 #include <oox/export/vmlexport.hxx>
+#include <docxtablestyleexport.hxx>
 
 class SwGrfNode;
 class SdrObject;
@@ -217,10 +218,6 @@ public:
     /// Write latent styles.
     void LatentStyles();
 
-    /// Write table styles from InteropGrabBag.
-    void TableStyles();
-    void TableStyle(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rStyle);
-
     /** Similar to OutputItem(), but write something only if it is not the default.
 
         This is to output the docDefaults, and we should write something out
@@ -766,6 +763,8 @@ private:
 
     PageMargins m_pageMargins;
 
+    boost::shared_ptr<DocxTableStyleExport> m_pTableStyleExport;
+
 public:
     DocxAttributeOutput( DocxExport &rExport, ::sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML );
 
@@ -776,7 +775,7 @@ public:
     const DocxExport& GetExport() const { return const_cast< DocxAttributeOutput* >( this )->GetExport(); }
 
     /// For eg. the output of the styles, we need to switch the serializer to an other one.
-    void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer ) { m_pSerializer = pSerializer; }
+    void SetSerializer( ::sax_fastparser::FSHelperPtr pSerializer );
 
     /// Occasionnaly need to use this serializer from the outside
     ::sax_fastparser::FSHelperPtr GetSerializer( ) { return m_pSerializer; }

sw/source/filter/ww8/docxhelper.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _DOCXHELPER_HXX_
+#define _DOCXHELPER_HXX_
+
+#include <rtl/ustring.hxx>
+
+struct DocxStringTokenMap
+{
+    const char* pToken;
+    sal_Int32 nToken;
+};
+
+sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, OUString aName);
+
+#endif // _DOCXHELPER_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/filter/ww8/docxtablestyleexport.hxx

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef _DOCXTABLESTYLEXPORT_HXX_
+#define _DOCXTABLESTYLEXPORT_HXX_
+
+#include <boost/shared_ptr.hpp>
+#include <sax/fshelper.hxx>
+
+class SwDoc;
+
+/// Handles DOCX export of table styles, based on InteropGrabBag.
+class DocxTableStyleExport
+{
+    class Impl;
+    boost::shared_ptr<Impl> m_pImpl;
+public:
+    void TableStyles();
+    void SetSerializer(sax_fastparser::FSHelperPtr pSerializer);
+    DocxTableStyleExport(SwDoc* pDoc, sax_fastparser::FSHelperPtr pSerializer);
+    ~DocxTableStyleExport();
+};
+
+#endif // _DOCXTABLESTYLEXPORT_HXX_
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */