added tag helptext

5 files changed, 26 insertions, 8 deletions

diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd
index 5c72c05800d5..21dcf5c4884b 100644
--- a/xmlscript/dtd/dialog.dtd
+++ b/xmlscript/dtd/dialog.dtd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	$Id: dialog.dtd,v 1.9 2001-03-15 09:22:02 dbo Exp $
+	$Id: dialog.dtd,v 1.10 2001-03-22 15:43:06 dbo Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -68,6 +68,7 @@
 			       dlg:printable %boolean; #IMPLIED
 			       dlg:page %numeric; #IMPLIED
 			       dlg:tag CDATA #IMPLIED
+			       dlg:helptext CDATA #IMPLIED
 			       ">
 
 <!ENTITY % control "(dlg:bulletinboard|
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index af912f97e2f3..abcfad5370b2 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmldlg_export.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-15 14:44:15 $
+ *  last change: $Author: dbo $ $Date: 2001-03-22 15:43:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -666,6 +666,8 @@ void ElementDescriptor::readDefaults()
                   OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":page") ) );
     readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tag") ),
                     OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tag") ) );
+    readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("HelpText") ),
+                    OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":helptext") ) );
 }
 //__________________________________________________________________________________________________
 void ElementDescriptor::readEvents()
@@ -1070,6 +1072,8 @@ SAL_DLLEXPORT void SAL_CALL exportDialogModel(
                                OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":page") ) );
         pWindow->readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("Tag") ),
                                  OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":tag") ) );
+        pWindow->readStringAttr( OUString( RTL_CONSTASCII_USTRINGPARAM("HelpText") ),
+                                 OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":helptext") ) );
         xOut->ignorableWhitespace( OUString() );
         xOut->startElement( aWindowName, xWindow );
 
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 37f811dd84d7..a4342ce5bbc2 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmldlg_impmodels.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-15 14:44:15 $
+ *  last change: $Author: dbo $ $Date: 2001-03-22 15:43:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1573,6 +1573,16 @@ void WindowElement::endElement()
             OUString( RTL_CONSTASCII_USTRINGPARAM("Tag") ),
             makeAny( aValue ) );
     }
+
+    aValue = _xAttributes->getValueByUidName(
+        XMLNS_DIALOGS_UID, OUString( RTL_CONSTASCII_USTRINGPARAM("helptext") ) );
+    if (aValue.getLength())
+    {
+        xProps->setPropertyValue(
+            OUString( RTL_CONSTASCII_USTRINGPARAM("HelpText") ),
+            makeAny( aValue ) );
+    }
 }
 
+
 };
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index 2ee54ae8d43a..26f1cc630135 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmldlg_import.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-14 16:39:59 $
+ *  last change: $Author: dbo $ $Date: 2001-03-22 15:43:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -868,6 +868,9 @@ void ControlImportContext::importDefaults(
     importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("Tag") ),
                           OUString( RTL_CONSTASCII_USTRINGPARAM("tag") ),
                           xAttributes );
+    importStringProperty( OUString( RTL_CONSTASCII_USTRINGPARAM("HelpText") ),
+                          OUString( RTL_CONSTASCII_USTRINGPARAM("helptext") ),
+                          xAttributes );
 }
 //__________________________________________________________________________________________________
 void ControlImportContext::importEvents(
diff --git a/xmlscript/test/test.xml b/xmlscript/test/test.xml
index ad3d0bacd0c9..ebdf3bba8b2a 100644
--- a/xmlscript/test/test.xml
+++ b/xmlscript/test/test.xml
@@ -19,7 +19,7 @@
 
         <button dlg:id="button3" ns:value="hallo2" dlg:left="250" ns:top="50" width="50" height="50" style-id="bla" xmlns:ns="http://openoffice.org/2000/dialog"/>
 
-        <checkbox id="check1" value="checked" left="50" top="150" width="100" height="20" checked="true"/>
+        <checkbox id="check1" helptext="helphelphelp!!!" value="checked" left="50" top="150" width="100" height="20" checked="true"/>
         <checkbox id="check2" value="dontknow" left="50" top="170" width="100" height="20" tristate="true"/>
         <checkbox id="check3" value="tristate_checked" left="50" top="190" width="100" height="20" checked="true" tristate="true"/>