added step, tag

xmlscript/dtd/dialog.dtd

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	$Id: dialog.dtd,v 1.6 2001-03-01 13:14:50 dbo Exp $
+	$Id: dialog.dtd,v 1.7 2001-03-07 14:57:38 dbo Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -66,6 +66,8 @@
 			       dialog:tab-index %numeric; #IMPLIED
 			       dialog:disabled %boolean; #IMPLIED
 			       dialog:printable %boolean; #IMPLIED
+			       dialog:page %numeric; #IMPLIED
+			       dialog:tag CDATA #IMPLIED
 			       ">
 
 <!ENTITY % control "(dialog:bulletinboard|
@@ -95,7 +97,10 @@
 			dialog:top %numeric; #IMPLIED
 			dialog:width %numeric; #IMPLIED
 			dialog:height %numeric; #IMPLIED
-			dialog:title CDATA #IMPLIED>
+			dialog:title CDATA #IMPLIED
+			dialog:page %numeric; #IMPLIED
+			dialog:tag CDATA #IMPLIED
+			>
 
 <!ELEMENT dialog:styles (dialog:style+)>
 

xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmldlg_impmodels.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: ab $ $Date: 2001-03-02 15:56:48 $
+ *  last change: $Author: dbo $ $Date: 2001-03-07 14:57:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1528,37 +1528,50 @@ void WindowElement::endElement()
             OUString( RTL_CONSTASCII_USTRINGPARAM("Title") ),
             makeAny( aValue ) );
     }
-    aValue = _xAttributes->getValueByUidName(
-        XMLNS_DIALOGS_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("left") ) );
-    if (aValue.getLength())
+
+    sal_Int32 nLong;
+
+    if (getLongAttr( &nLong, OUString( RTL_CONSTASCII_USTRINGPARAM("left") ), _xAttributes ))
     {
         xProps->setPropertyValue(
             OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ),
-            makeAny( aValue.toInt32() ) );
+            makeAny( nLong ) );
     }
-    aValue = _xAttributes->getValueByUidName(
-        XMLNS_DIALOGS_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("top") ) );
-    if (aValue.getLength())
+    if (getLongAttr( &nLong, OUString( RTL_CONSTASCII_USTRINGPARAM("top") ), _xAttributes ))
     {
         xProps->setPropertyValue(
             OUString( RTL_CONSTASCII_USTRINGPARAM("PositionY") ),
-            makeAny( aValue.toInt32() ) );
+            makeAny( nLong ) );
     }
-    aValue = _xAttributes->getValueByUidName(
-        XMLNS_DIALOGS_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("width") ) );
-    if (aValue.getLength())
+    if (getLongAttr( &nLong, OUString( RTL_CONSTASCII_USTRINGPARAM("width") ), _xAttributes ))
     {
         xProps->setPropertyValue(
             OUString( RTL_CONSTASCII_USTRINGPARAM("Width") ),
-            makeAny( aValue.toInt32() ) );
+            makeAny( nLong ) );
+    }
+    if (getLongAttr( &nLong, OUString( RTL_CONSTASCII_USTRINGPARAM("height") ), _xAttributes ))
+    {
+        xProps->setPropertyValue(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ),
+            makeAny( nLong ) );
+    }
+
+    if (! getLongAttr( &nLong, OUString( RTL_CONSTASCII_USTRINGPARAM("page") ), _xAttributes ))
+    {
+        nLong = 0;
     }
+
+    xProps->setPropertyValue(
+        OUString( RTL_CONSTASCII_USTRINGPARAM("Step") ),
+        makeAny( nLong ) );
+
     aValue = _xAttributes->getValueByUidName(
-        XMLNS_DIALOGS_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("height") ) );
+        XMLNS_DIALOGS_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("tag") ) );
     if (aValue.getLength())
     {
         xProps->setPropertyValue(
-            OUString( RTL_CONSTASCII_USTRINGPARAM("Height") ),
-            makeAny( aValue.toInt32() ) );
+            OUString( RTL_CONSTASCII_USTRINGPARAM("Tag") ),
+            makeAny( aValue ) );
     }
 }
 

xmlscript/source/xmldlg_imexp/xmldlg_import.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmldlg_import.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-01 13:14:51 $
+ *  last change: $Author: dbo $ $Date: 2001-03-07 14:57:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -820,9 +820,9 @@ void ControlImportContext::importDefaults(
         OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ),
         makeAny( _aId ) );
 
-    importLongProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("TabIndex") ),
-                        OUString( RTL_CONSTASCII_USTRINGPARAM("tab-index") ),
-                        xAttributes );
+    importShortProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("TabIndex") ),
+                         OUString( RTL_CONSTASCII_USTRINGPARAM("tab-index") ),
+                         xAttributes );
 
     sal_Bool bDisable;
     if (getBoolAttr( &bDisable, OUString( RTL_CONSTASCII_USTRINGPARAM("disabled") ), xAttributes ) &&
@@ -855,6 +855,19 @@ void ControlImportContext::importDefaults(
     importBooleanProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Printable") ),
                            OUString( RTL_CONSTASCII_USTRINGPARAM("printable") ),
                            xAttributes );
+
+    sal_Int32 nLong;
+    if (! getLongAttr( &nLong, OUString( RTL_CONSTASCII_USTRINGPARAM("page") ), xAttributes ))
+    {
+        nLong = 0;
+    }
+    _xControlModel->setPropertyValue(
+        OUString( RTL_CONSTASCII_USTRINGPARAM("Step") ),
+        makeAny( nLong ) );
+
+    importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tag") ),
+                          OUString( RTL_CONSTASCII_USTRINGPARAM("tag") ),
+                          xAttributes );
 }
 //__________________________________________________________________________________________________
 void ControlImportContext::importEvents(