merge DEV300_m77

3 files changed, 23 insertions, 28 deletions

diff --git a/offapi/com/sun/star/text/RedlinePortion.idl b/offapi/com/sun/star/text/RedlinePortion.idl
index be39882474c3..c399d976e04a 100644
--- a/offapi/com/sun/star/text/RedlinePortion.idl
+++ b/offapi/com/sun/star/text/RedlinePortion.idl
@@ -52,7 +52,7 @@ published service RedlinePortion
     /** contains the name of the author of the change.*/
     [readonly, property] string RedlineAuthor;
     /** contains the date and time of the change.*/
-    [readonly, property] com::sun::star::util::DateTime RedlineDataTime;
+    [readonly, property] com::sun::star::util::DateTime RedlineDateTime;
     /** contains a comment for the change.*/
     [readonly, property] string RedlineComment;
     /** contains the type of the change
@@ -70,7 +70,7 @@ published service RedlinePortion
         <p> The elements of the sequence are:</p>
         <UL>
             <LI><P>string RedlineAuthor;                              </P>
-            <LI><P>com::sun::star::util::DateTime RedlineDataTime;    </P>
+            <LI><P>com::sun::star::util::DateTime RedlineDateTime;    </P>
             <LI><P>string RedlineComment;                             </P>
             <LI><P>string RedlineType;                                </P>
         </UL>
diff --git a/offapi/com/sun/star/text/XFormField.idl b/offapi/com/sun/star/text/XFormField.idl
index f1f2d1bab9b9..53555728ba40 100644
--- a/offapi/com/sun/star/text/XFormField.idl
+++ b/offapi/com/sun/star/text/XFormField.idl
@@ -1,26 +1,20 @@
- #ifndef __com_sun_star_text_XFormField_idl__
- #define __com_sun_star_text_XFormField_idl__
+#ifndef __com_sun_star_text_XFormField_idl__
+#define __com_sun_star_text_XFormField_idl__
 
- #ifndef __com_sun_star_uno_XInterface_idl__
- #include <com/sun/star/uno/XInterface.idl>
- #endif
+#include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/container/XNameContainer.idl>
 
- module com {  module sun {  module star {  module text {
+module com {  module sun {  module star {  module text {
 
-/** @deprecated
- */
- interface XFormField: com::sun::star::uno::XInterface
- {
-     short getType();
-     short getRes();
-     string getDescription( );
+    /** @deprecated
+     */
+    interface XFormField : com::sun::star::uno::XInterface
+    {
+        string getFieldType();
+        void setFieldType([in] string fieldType);
+        com::sun::star::container::XNameContainer getParameters();
+    };
 
-     void setType([in] short fieldType );
-     void setRes([in] short res );
-     void setDescription([in] string description );
+}; }; }; };
 
- };
-
- }; }; }; };
-
- #endif
+#endif
diff --git a/offapi/com/sun/star/text/textfield/MetadataField.idl b/offapi/com/sun/star/text/textfield/MetadataField.idl
index 962df24dcc06..d98c4be39e96 100755
--- a/offapi/com/sun/star/text/textfield/MetadataField.idl
+++ b/offapi/com/sun/star/text/textfield/MetadataField.idl
@@ -54,7 +54,8 @@
 module com { module sun { module star { module text { module textfield {
 
 //=============================================================================
-/** is a <type>TextField</type> whose content is specified by RDF metadata.
+/** is a <type scope="com::sun::star::text">TextField</type> whose content
+    is specified by RDF metadata.
 
     @since OOo 3.2
 
@@ -63,8 +64,8 @@ module com { module sun { module star { module text { module textfield {
 service MetadataField
 {
     //-------------------------------------------------------------------------
-    /** None of the properties of <type>TextContent</type> are
-        supported. */
+    /** None of the properties of
+        <type scope="com::sun::star::text">TextContent</type> are supported. */
     service  com::sun::star::text::TextField;
 
     //-------------------------------------------------------------------------
@@ -77,8 +78,8 @@ service MetadataField
     interface com::sun::star::text::XText;
 
     //-------------------------------------------------------------------------
-    /** The <type>TextContent</type>s that are contained in the
-        <type>MetadataField</type> can be enumerated. */
+    /** The <type scope="com::sun::star::text">TextContent</type>s that are
+        contained in the <type>MetadataField</type> can be enumerated. */
     interface com::sun::star::container::XEnumerationAccess;
 
     //-------------------------------------------------------------------------