diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-05-07 18:28:08 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-05-19 10:27:08 +0200 |
| commit | 97e9b250426ff09bba4546835ee9138d91e03fbb (patch) | |
| tree | c28c8ee09fe657a146b82dabab07c9bf13e9a842 /include/xmloff/XMLPageExport.hxx | |
| parent | 4e98ba4ba5c17ab8ae1170662af645b9d2bfde84 (diff) | |
tdf#103602 xmloff,sw: ODF 1.3 export: PageStyle with drawing-page style
Associate a style of family "drawing-page" with a style:master-page.
This fixes the small part of the draw:fill attribute problem that is
covered by OFFICE-3937 in ODF 1.3.
Exporting the "drawing-page" style is only allowed in ODF 1.3; all
property map entries have ODFSVER_ODF013 and this causes no style
to be exported for earlier versions.
Continue to export the invalid draw:fill attributes on the
style:page-layout for now, until the import of this is more widely
deployed.
This only works with Writer, because Calc doesn't implement FillStyle
properties on its page styles.
Change-Id: I4b24ae3eaf332723e24671e594eca5e36d48f525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93671
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'include/xmloff/XMLPageExport.hxx')
| -rw-r--r-- | include/xmloff/XMLPageExport.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx index 9800502f60a5..73a60ef1c5f0 100644 --- a/include/xmloff/XMLPageExport.hxx +++ b/include/xmloff/XMLPageExport.hxx @@ -44,6 +44,7 @@ class SvXMLExportPropertyMapper; struct XMLPageExportNameEntry { OUString sPageMasterName; + OUString sDrawingPageStyleName; OUString sStyleName; }; @@ -55,11 +56,12 @@ class XMLOFF_DLLPUBLIC XMLPageExport : public salhelper::SimpleReferenceObject css::uno::Reference< css::container::XNameAccess > xPageStyles; ::std::vector< XMLPageExportNameEntry > aNameVector; - SAL_DLLPRIVATE bool findPageMasterName( const OUString& rStyleName, OUString& rPMName ) const; rtl::Reference < XMLPropertyHandlerFactory > xPageMasterPropHdlFactory; rtl::Reference < XMLPropertySetMapper > xPageMasterPropSetMapper; rtl::Reference < SvXMLExportPropertyMapper > xPageMasterExportPropMapper; + rtl::Reference<XMLPropertySetMapper> m_xPageMasterDrawingPagePropSetMapper; + rtl::Reference<SvXMLExportPropertyMapper> m_xPageMasterDrawingPageExportPropMapper; protected: @@ -67,7 +69,7 @@ protected: void collectPageMasterAutoStyle( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, - OUString& rPageMasterName ); + XMLPageExportNameEntry & rEntry); virtual void exportMasterPageContent( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, |