default styles

3 files changed, 17 insertions, 11 deletions

diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod
index bb9e6af04057..0c3c5624e7c2 100644
--- a/xmloff/dtd/office.mod
+++ b/xmloff/dtd/office.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: office.mod,v 1.22 2001-01-03 09:55:08 mib Exp $
+	$Id: office.mod,v 1.23 2001-01-05 10:23:08 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -110,9 +110,10 @@
 
 <!ELEMENT office:font-decls (style:font-decl)*>
 
-<!ENTITY % styles "(style:style|text:list-style|number:number-style|
-		number:currency-style|number:percentage-style|number:date-style|
-		number:time-style|number:boolean-style|number:text-style|
+<!ENTITY % styles "(style:default-style|style:style|text:list-style|
+		number:number-style|number:currency-style|number:percentage-style|
+		number:date-style|number:time-style|number:boolean-style|
+		number:text-style|
 		draw:gradient|draw:hatch|draw:fill-image|draw:marker|draw:stroke-dash|
 		style:presentation-page-layout|draw:transparency)">
 
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index 99d4544e2d8d..1607a1fdea27 100644
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: style.mod,v 1.22 2001-01-03 16:18:51 fs Exp $
+	$Id: style.mod,v 1.23 2001-01-05 10:23:08 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -73,6 +73,7 @@
 <!ATTLIST style:style style:family %styleFamily; #REQUIRED>
 
 <!ATTLIST style:style style:parent-style-name %styleName; #IMPLIED>
+<!ATTLIST style:style style:master-page-name %styleName; #IMPLIED>
 <!ATTLIST style:style style:next-style-name %styleName; #IMPLIED>
 <!ATTLIST style:style style:list-style-name %styleName; #IMPLIED>
 <!ATTLIST style:style style:data-style-name %styleName; #IMPLIED>
@@ -81,6 +82,8 @@
 
 <!ATTLIST style:style style:class %string; #IMPLIED>
 
+<!ELEMENT style:default-style (style:properties?)>
+<!ATTLIST style:default-style style:family %styleFamily; #REQUIRED>
 
 <!ELEMENT style:map EMPTY>
 
@@ -228,11 +231,12 @@
 						   #IMPLIED>
 <!ATTLIST style:properties fo:hyphenation-ladder-count
 						   %noLimitOrPositiveInteger;  #IMPLIED>
+<!ATTLIST style:properties style:page-number %positiveInteger; #IMPLIED>
 
 <!ELEMENT style:tab-stops (style:tab-stop)*>
 <!ELEMENT style:tab-stop EMPTY>
 <!ATTLIST style:tab-stop style:position %nonNegativeLength; #REQUIRED>
-<!ATTLIST style:tab-stop style:type (left|center|right|char) "left">
+<!ATTLIST style:tab-stop style:type (left|center|right|char|default) "left">
 <!ATTLIST style:tab-stop style:char %character; #IMPLIED>
 <!ATTLIST style:tab-stop style:leader-char %character; " ">
 
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 5be4d721c475..d3a87453b196 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: styleexp.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-05 10:01:15 $
+ *  last change: $Author: mib $ $Date: 2001-01-05 10:19:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -312,7 +312,7 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
         GetExport().AddAttributeASCII( XML_NAMESPACE_STYLE, sXML_family,
                                          pXMLFamily );
 
-
+#if 0
     // style:list-style-name="..." (SW paragarph styles only)
     if( xPropSetInfo->hasPropertyByName( sNumberingStyleName ) )
     {
@@ -327,10 +327,11 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
                                           sXML_list_style_name, sListName );
         }
     }
+#endif
 
     // style:pool-id="..." is not required any longer since we use
     // english style names only
-    exportStyleAttributes( rStyle );
+//  exportStyleAttributes( rStyle );
 
     {
         // <style:style>
@@ -344,7 +345,7 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
                                   GetExport().GetMM100UnitConverter(),
                                      GetExport().GetNamespaceMap(),
                                      XML_EXPORT_FLAG_IGN_WS );
-        exportStyleContent( rStyle );
+//      exportStyleContent( rStyle );
     }
     return sal_True;
 }