Kaydet (Commit) 16fffbe8 authored tarafından Regina Henschel's avatar Regina Henschel

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: 's avatarRegina Henschel <rb.henschel@t-online.de>
üst f7923dee
......@@ -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
};
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment