diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-11-07 19:11:11 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-11-08 22:58:21 +0100 |
commit | 1535f39388223de53e4b923c6f7bb71ee32c1858 (patch) | |
tree | 9f123414f83b64970b64b3b60b5429b63fc30dba /include/xmloff/xmlnume.hxx | |
parent | sw: refactor SwXNumberingRules (diff) | |
download | core-1535f39388223de53e4b923c6f7bb71ee32c1858.tar.gz core-1535f39388223de53e4b923c6f7bb71ee32c1858.zip |
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
Diffstat (limited to 'include/xmloff/xmlnume.hxx')
-rw-r--r-- | include/xmloff/xmlnume.hxx | 21 |
1 files changed, 11 insertions, 10 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 ); |