#80012# changed style:page-master to contain a style:properties section

xmloff/source/draw/sdxmlexp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlexp.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: cl $ $Date: 2000-11-26 19:43:50 $
+ *  last change: $Author: aw $ $Date: 2000-11-27 12:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1414,6 +1414,10 @@ void SdXMLExport::ImpWritePageMasterInfos()
             sString = sNewName;
             AddAttribute(XML_NAMESPACE_STYLE, sXML_name, sString);
 
+            // write page-master
+            SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, sXML_page_master, sal_True, sal_True);
+
+            // prepare style:properties inside page-master
             GetMM100UnitConverter().convertMeasure(sStringBuffer, pInfo->GetBorderTop());
             sString = sStringBuffer.makeStringAndClear();
             AddAttribute(XML_NAMESPACE_FO, sXML_margin_top, sString);
@@ -1443,8 +1447,8 @@ void SdXMLExport::ImpWritePageMasterInfos()
             else
                 AddAttributeASCII(XML_NAMESPACE_FO, sXML_page_orientation, sXML_orientation_landscape);
 
-            // write page-master
-            SvXMLElementExport aPME(*this, XML_NAMESPACE_STYLE, sXML_page_master, sal_True, sal_True);
+            // write style:properties
+            SvXMLElementExport aPMF(*this, XML_NAMESPACE_STYLE, sXML_properties, sal_True, sal_True);
         }
     }
 }

xmloff/source/draw/sdxmlimp.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sdxmlimp.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:07:03 $
+ *  last change: $Author: aw $ $Date: 2000-11-27 12:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -170,13 +170,18 @@ static __FAR_DATA SvXMLTokenMapEntry aMasterPageAttrTokenMap[] =
 static __FAR_DATA SvXMLTokenMapEntry aPageMasterAttrTokenMap[] =
 {
     { XML_NAMESPACE_STYLE,          sXML_name,              XML_TOK_PAGEMASTER_NAME                 },
-    { XML_NAMESPACE_FO,             sXML_margin_top,        XML_TOK_PAGEMASTER_MARGIN_TOP           },
-    { XML_NAMESPACE_FO,             sXML_margin_bottom,     XML_TOK_PAGEMASTER_MARGIN_BOTTOM        },
-    { XML_NAMESPACE_FO,             sXML_margin_left,       XML_TOK_PAGEMASTER_MARGIN_LEFT          },
-    { XML_NAMESPACE_FO,             sXML_margin_right,      XML_TOK_PAGEMASTER_MARGIN_RIGHT         },
-    { XML_NAMESPACE_FO,             sXML_page_width,        XML_TOK_PAGEMASTER_PAGE_WIDTH           },
-    { XML_NAMESPACE_FO,             sXML_page_height,       XML_TOK_PAGEMASTER_PAGE_HEIGHT          },
-    { XML_NAMESPACE_FO,             sXML_page_orientation,  XML_TOK_PAGEMASTER_PAGE_ORIENTATION     },
+    XML_TOKEN_MAP_END
+};
+
+static __FAR_DATA SvXMLTokenMapEntry aPageMasterStyleAttrTokenMap[] =
+{
+    { XML_NAMESPACE_FO,             sXML_margin_top,        XML_TOK_PAGEMASTERSTYLE_MARGIN_TOP          },
+    { XML_NAMESPACE_FO,             sXML_margin_bottom,     XML_TOK_PAGEMASTERSTYLE_MARGIN_BOTTOM       },
+    { XML_NAMESPACE_FO,             sXML_margin_left,       XML_TOK_PAGEMASTERSTYLE_MARGIN_LEFT         },
+    { XML_NAMESPACE_FO,             sXML_margin_right,      XML_TOK_PAGEMASTERSTYLE_MARGIN_RIGHT        },
+    { XML_NAMESPACE_FO,             sXML_page_width,        XML_TOK_PAGEMASTERSTYLE_PAGE_WIDTH          },
+    { XML_NAMESPACE_FO,             sXML_page_height,       XML_TOK_PAGEMASTERSTYLE_PAGE_HEIGHT         },
+    { XML_NAMESPACE_FO,             sXML_page_orientation,  XML_TOK_PAGEMASTERSTYLE_PAGE_ORIENTATION    },
     XML_TOKEN_MAP_END
 };
 
@@ -311,6 +316,7 @@ SdXMLImport::SdXMLImport(
     mpMasterPageElemTokenMap(0L),
     mpMasterPageAttrTokenMap(0L),
     mpPageMasterAttrTokenMap(0L),
+    mpPageMasterStyleAttrTokenMap(0L),
     mpDrawPageAttrTokenMap(0L),
     mpDrawPageElemTokenMap(0L),
     mpPresentationPlaceholderAttrTokenMap(0L),
@@ -399,6 +405,8 @@ SdXMLImport::~SdXMLImport()
         delete mpMasterPageAttrTokenMap;
     if(mpPageMasterAttrTokenMap)
         delete mpPageMasterAttrTokenMap;
+    if(mpPageMasterStyleAttrTokenMap)
+        delete mpPageMasterStyleAttrTokenMap;
     if(mpDrawPageAttrTokenMap)
         delete mpDrawPageAttrTokenMap;
     if(mpDrawPageElemTokenMap)
@@ -472,6 +480,15 @@ const SvXMLTokenMap& SdXMLImport::GetPageMasterAttrTokenMap()
 
 //////////////////////////////////////////////////////////////////////////////
 
+const SvXMLTokenMap& SdXMLImport::GetPageMasterStyleAttrTokenMap()
+{
+    if(!mpPageMasterStyleAttrTokenMap)
+        mpPageMasterStyleAttrTokenMap = new SvXMLTokenMap(aPageMasterStyleAttrTokenMap);
+    return *mpPageMasterStyleAttrTokenMap;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
 const SvXMLTokenMap& SdXMLImport::GetDrawPageAttrTokenMap()
 {
     if(!mpDrawPageAttrTokenMap)

xmloff/source/draw/ximpstyl.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ximpstyl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:07:04 $
+ *  last change: $Author: aw $ $Date: 2000-11-27 12:52:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,9 +83,9 @@
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
-// style:page-master context
+// special style:style context inside style:page-master context
 
-class SdXMLPageMasterContext: public SvXMLStyleContext
+class SdXMLPageMasterStyleContext: public SvXMLStyleContext
 {
     sal_Int32                   mnBorderBottom;
     sal_Int32                   mnBorderLeft;
@@ -94,7 +94,6 @@ class SdXMLPageMasterContext: public SvXMLStyleContext
     sal_Int32                   mnWidth;
     sal_Int32                   mnHeight;
     com::sun::star::view::PaperOrientation meOrientation;
-    rtl::OUString               msName;
 
     const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
     SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
@@ -102,14 +101,13 @@ class SdXMLPageMasterContext: public SvXMLStyleContext
 public:
     TYPEINFO();
 
-    SdXMLPageMasterContext(
+    SdXMLPageMasterStyleContext(
         SdXMLImport& rImport,
         sal_uInt16 nPrfx,
         const rtl::OUString& rLName,
         const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
-    virtual ~SdXMLPageMasterContext();
+    virtual ~SdXMLPageMasterStyleContext();
 
-    const rtl::OUString& GetName() const { return msName; }
     sal_Int32 GetBorderBottom() const { return mnBorderBottom; }
     sal_Int32 GetBorderLeft() const { return mnBorderLeft; }
     sal_Int32 GetBorderRight() const { return mnBorderRight; }
@@ -119,6 +117,35 @@ public:
     com::sun::star::view::PaperOrientation GetOrientation() const { return meOrientation; }
 };
 
+//////////////////////////////////////////////////////////////////////////////
+// style:page-master context
+
+class SdXMLPageMasterContext: public SvXMLStyleContext
+{
+    rtl::OUString               msName;
+    SdXMLPageMasterStyleContext*mpPageMasterStyle;
+
+    const SdXMLImport& GetSdImport() const { return (const SdXMLImport&)GetImport(); }
+    SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); }
+
+public:
+    TYPEINFO();
+
+    SdXMLPageMasterContext(
+        SdXMLImport& rImport,
+        sal_uInt16 nPrfx,
+        const rtl::OUString& rLName,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList);
+    virtual ~SdXMLPageMasterContext();
+
+    virtual SvXMLImportContext *CreateChildContext(
+        sal_uInt16 nPrefix, const rtl::OUString& rLocalName,
+        const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList );
+
+    const rtl::OUString& GetName() const { return msName; }
+    const SdXMLPageMasterStyleContext* GetPageMasterStyle() const { return mpPageMasterStyle; }
+};
+
 //////////////////////////////////////////////////////////////////////////////
 // style:masterpage context