diff options
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/style/makefile.mk | 18 | ||||
-rw-r--r-- | xmloff/source/style/xmlstyle.cxx | 28 |
2 files changed, 40 insertions, 6 deletions
diff --git a/xmloff/source/style/makefile.mk b/xmloff/source/style/makefile.mk index c338b1965fa4..29188e88ddf7 100644 --- a/xmloff/source/style/makefile.mk +++ b/xmloff/source/style/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: cl $ $Date: 2000-10-20 14:53:32 $ +# last change: $Author: sab $ $Date: 2000-10-23 10:26:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -146,7 +146,12 @@ CXXFILES = \ PageMasterPropHdlFactory.cxx \ PageMasterStyleMap.cxx \ PageMasterPropMapper.cxx \ - PageMasterExportPropMapper.cxx + PageMasterExportPropMapper.cxx \ + PageMasterImportPropMapper.cxx \ + PageMasterImportContext.cxx \ + PagePropertySetContext.cxx \ + PageHeaderFooterContext.cxx + SLOFILES = \ $(SLO)$/adjushdl.obj \ @@ -217,7 +222,12 @@ SLOFILES = \ $(SLO)$/PageMasterPropHdlFactory.obj \ $(SLO)$/PageMasterStyleMap.obj \ $(SLO)$/PageMasterPropMapper.obj \ - $(SLO)$/PageMasterExportPropMapper.obj + $(SLO)$/PageMasterExportPropMapper.obj \ + $(SLO)$/PageMasterImportPropMapper.obj \ + $(SLO)$/PageMasterImportContext.obj \ + $(SLO)$/PagePropertySetContext.obj \ + $(SLO)$/PageHeaderFooterContext.obj + # --- Tagets ------------------------------------------------------- diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 202bd20793fc..2dbac53ab8ae 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlstyle.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mib $ $Date: 2000-10-18 11:18:29 $ + * last change: $Author: sab $ $Date: 2000-10-23 10:27:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,9 @@ #ifndef _COM_SUN_STAR_STYLE_XSTYLEFAMILIESSUPPLIER_HPP_ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #endif +#ifndef _XMLOFF_PAGEMASTERPROPMAPPER_HXX +#include "PageMasterPropMapper.hxx" +#endif #ifndef _TOOLS_DEBUG_HXX //autogen wg. DBG_ASSERT #include <tools/debug.hxx> @@ -164,6 +167,12 @@ #ifndef _XMLOFF_XMLFOOTNOTECONFIGURATIONIMPORTCONTEXT_HXX #include "XMLFootnoteConfigurationImportContext.hxx" #endif +#ifndef _XMLOFF_PAGEMASTERIMPORTCONTEXT_HXX +#include "PageMasterImportContext.hxx" +#endif +#ifndef _XMLOFF_PAGEMASTERIMPORTPROPMAPPER_HXX +#include "PageMasterImportPropMapper.hxx" +#endif using namespace ::rtl; using namespace ::com::sun::star; @@ -176,6 +185,7 @@ using namespace ::com::sun::star::style; static __FAR_DATA SvXMLTokenMapEntry aStyleStylesElemTokenMap[] = { { XML_NAMESPACE_STYLE, sXML_style, XML_TOK_STYLE_STYLE }, + { XML_NAMESPACE_STYLE, sXML_page_master, XML_TOK_STYLE_PAGE_MASTER }, { XML_NAMESPACE_TEXT, sXML_list_style, XML_TOK_TEXT_LIST_STYLE }, { XML_NAMESPACE_TEXT, sXML_outline_style, XML_TOK_TEXT_OUTLINE }, { XML_NAMESPACE_DRAW, sXML_gradient, XML_TOK_STYLES_GRADIENTSTYLES }, @@ -532,6 +542,12 @@ SvXMLStyleContext *SvXMLStylesContext::CreateStyleChildContext( rLocalName, xAttrList ); } break; + case XML_TOK_STYLE_PAGE_MASTER: + { + pStyle = new PageStyleContext( GetImport(), nPrefix, + rLocalName, xAttrList, *this ); + } + break; case XML_TOK_TEXT_LIST_STYLE: pStyle = new SvxXMLListStyleContext( GetImport(), nPrefix, rLocalName, xAttrList ); @@ -733,6 +749,14 @@ UniReference < SvXMLImportPropertyMapper > SvXMLStylesContext::GetImportProperty } xMapper = xChartImpPropMapper; break; + case XML_STYLE_FAMILY_PAGE_MASTER: + if( ! xPageImpPropMapper.is() ) + { + XMLPropertySetMapper *pPropMapper = new XMLPageMasterPropSetMapper(); + xPageImpPropMapper = new PageMasterImportPropertyMapper( pPropMapper ); + } + xMapper = xPageImpPropMapper; + break; } return xMapper; |