sw: store Outline Numbering as ODF fragment instead of SfxPoolItems

This should be less fragile and re-uses some xmloff and unocore code.

Storing from ~SwBaseNumRules() does not work because other gobals that
the export code relies on are already dead at the time it is called from
a terminate() listener, so store when the dialog updates a format.

Change-Id: I4e148b82d0a338ec7ffa6429c6e162db79f8c44e

2 files changed, 14 insertions, 12 deletions

diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 8418ef26fe70..761872cbd5e6 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -37,7 +37,7 @@ class SvXMLExportItemMapper;
 class SvXMLExport;
 class XMLTextListAutoStylePool;
 
-class SvxXMLNumRuleExport
+class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport
 {
     SvXMLExport& rExport;
     const OUString sNumberingRules;
@@ -49,12 +49,7 @@ class SvxXMLNumRuleExport
     // to be suppressed on writing ODF 1.0 respectively ODF 1.1
     bool mbExportPositionAndSpaceModeLabelAlignment;
 
-    void exportLevelStyles(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::container::XIndexReplace > & xNumRule,
-            bool bOutline=false );
-
-    void exportLevelStyle(
+    SAL_DLLPRIVATE void exportLevelStyle(
             sal_Int32 nLevel,
             const ::com::sun::star::uno::Sequence<
                 ::com::sun::star::beans::PropertyValue>& rProps,
@@ -64,11 +59,11 @@ protected:
 
     // This method may be overloaded to add attributes to the <list-style>
     // element.
-    virtual void AddListStyleAttributes();
+    SAL_DLLPRIVATE virtual void AddListStyleAttributes();
 
-    bool exportStyle( const ::com::sun::star::uno::Reference<
+    SAL_DLLPRIVATE bool exportStyle( const ::com::sun::star::uno::Reference<
                             ::com::sun::star::style::XStyle >& rStyle );
-    void exportOutline();
+    SAL_DLLPRIVATE void exportOutline();
 
     SvXMLExport& GetExport() { return rExport; }
 
@@ -77,6 +72,12 @@ public:
     SvxXMLNumRuleExport( SvXMLExport& rExport );
     virtual ~SvxXMLNumRuleExport();
 
+    // should be private but sw::StoredChapterNumberingExport needs it
+    void exportLevelStyles(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::container::XIndexReplace > & xNumRule,
+            bool bOutline=false );
+
     void exportStyles( bool bUsed,
                        XMLTextListAutoStylePool *pPool,
                        bool bExportChapterNumbering = true );
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 4e7bc1591d5c..413b9ffa0dfa 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -30,7 +30,8 @@ class SvI18NMap;
 class SvxXMLListLevelStyleContext_Impl;
 typedef std::vector<SvxXMLListLevelStyleContext_Impl *> SvxXMLListStyle_Impl;
 
-class SvxXMLListStyleContext : public SvXMLStyleContext
+class XMLOFF_DLLPUBLIC SvxXMLListStyleContext
+    : public SvXMLStyleContext
 {
     const OUString       sIsPhysical;
     const OUString       sNumberingRules;
@@ -47,7 +48,7 @@ class SvxXMLListStyleContext : public SvXMLStyleContext
 
 protected:
 
-    virtual void SetAttribute( sal_uInt16 nPrefixKey,
+    SAL_DLLPRIVATE virtual void SetAttribute( sal_uInt16 nPrefixKey,
                                const OUString& rLocalName,
                                const OUString& rValue ) SAL_OVERRIDE;