xmloff/source/draw/sdxmlimp.cxx | 1 +
xmloff/source/draw/sdxmlimp_impl.hxx | 3 ++-
xmloff/source/draw/ximpbody.cxx | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 16fffbe869785dffeda9ae0d9f7c18a6559a2093
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Thu Jan 17 14:09:22 2019 +0100
Commit: Regina Henschel <rb.hensc...@t-online.de>
CommitDate: Sat Jan 19 00:41:16 2019 +0100
tdf#101218 Import layer-set from page
This patch is a interim solution for document exchange between
Karbon and LibreOffice, till layer-set for page and for
master-page is implemented some day.
Change-Id: I2f12eeeb9c742f65999fd4c0d95c418273ae008f
Reviewed-on: https://gerrit.libreoffice.org/66518
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 9a68a31634fd..6ba506ef6832 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -578,6 +578,7 @@ const SvXMLTokenMap& SdXMLImport::GetDrawPageElemTokenMap()
{ XML_NAMESPACE_PRESENTATION, XML_NOTES,
XML_TOK_DRAWPAGE_NOTES },
{ XML_NAMESPACE_ANIMATION, XML_PAR,
XML_TOK_DRAWPAGE_PAR },
{ XML_NAMESPACE_ANIMATION, XML_SEQ,
XML_TOK_DRAWPAGE_SEQ },
+ { XML_NAMESPACE_DRAW, XML_LAYER_SET,
XML_TOK_DRAWPAGE_LAYER_SET },
XML_TOKEN_MAP_END
};
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx
b/xmloff/source/draw/sdxmlimp_impl.hxx
index 40010440c597..e61f8866ff2f 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -110,7 +110,8 @@ enum SdXMLDrawPageElemTokenMap
{
XML_TOK_DRAWPAGE_NOTES,
XML_TOK_DRAWPAGE_PAR,
- XML_TOK_DRAWPAGE_SEQ
+ XML_TOK_DRAWPAGE_SEQ,
+ XML_TOK_DRAWPAGE_LAYER_SET
};
enum SdXMLPresentationPlaceholderAttrTokenMap
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 0b682b4a4494..de7a9cac23d1 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -35,6 +35,7 @@
#include <xmloff/xmlprmap.hxx>
#include <xmloff/families.hxx>
#include "ximpshow.hxx"
+#include "layerimp.hxx"
#include <PropertySetMerger.hxx>
#include <animationimport.hxx>
#include <osl/diagnose.hxx>
@@ -258,6 +259,10 @@ SvXMLImportContextRef
SdXMLDrawPageContext::CreateChildContext( sal_uInt16 nPref
}
break;
}
+ case XML_TOK_DRAWPAGE_LAYER_SET:
+ {
+ xContext = new SdXMLLayerSetContext( GetSdImport(), nPrefix,
rLocalName, xAttrList );
+ }
}
// call parent when no own context was created
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
