#i10000# Reverted last commit. Should have gone to a CWS, not into HEAD directly.

3 files changed, 22 insertions, 99 deletions

diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index f464b6c94c..080fcbf70e 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: txtflde.cxx,v $
  *
- *  $Revision: 1.70 $
+ *  $Revision: 1.71 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2007-01-30 14:50:24 $
+ *  last change: $Author: rt $ $Date: 2007-02-01 10:06:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -467,8 +467,7 @@ XMLTextFieldExport::XMLTextFieldExport( SvXMLExport& rExp,
     sPropertyValue(RTL_CONSTASCII_USTRINGPARAM("Value")),
     sPropertyVariableName(RTL_CONSTASCII_USTRINGPARAM("VariableName")),
     sPropertyVariableSubType(RTL_CONSTASCII_USTRINGPARAM("VariableSubtype")),
-      sPropertyHelp(RTL_CONSTASCII_USTRINGPARAM("Help")),
-      sPropertyTooltip(RTL_CONSTASCII_USTRINGPARAM("Tooltip")),
+
       pCombinedCharactersPropertyState(pCombinedCharState)
 {
     SetExportOnlyUsedFieldDeclarations();
@@ -1348,10 +1347,6 @@ void XMLTextFieldExport::ExportFieldHelper(
         // text input field: description and string-value
         ProcessString(XML_DESCRIPTION,
                       GetStringProperty(sPropertyHint, rPropSet));
-        ProcessString(XML_HELP,
-                      GetStringProperty(sPropertyHelp, rPropSet), true);
-        ProcessString(XML_HINT,
-                      GetStringProperty(sPropertyTooltip, rPropSet), true);
         ExportElement(XML_TEXT_INPUT, sPresentation);
         break;
 
@@ -1902,17 +1897,12 @@ void XMLTextFieldExport::ExportFieldHelper(
     case FIELD_ID_DROP_DOWN:
     {
         ProcessString(XML_NAME, GetStringProperty(sPropertyName, rPropSet));
-        ProcessString(XML_HELP, 
-                      GetStringProperty(sPropertyHelp, rPropSet), true);
-        ProcessString(XML_HINT, 
-                      GetStringProperty(sPropertyTooltip, rPropSet), true);
         SvXMLElementExport aElem( GetExport(),
                                   XML_NAMESPACE_TEXT, XML_DROPDOWN,
                                   sal_False, sal_False );
-        ProcessStringSequence
-            (GetStringSequenceProperty( sPropertyItems, rPropSet ),
-             GetStringProperty( sPropertySelectedItem, rPropSet ) );
-        
+        ProcessStringSequence(
+            GetStringSequenceProperty( sPropertyItems, rPropSet ),
+            GetStringProperty( sPropertySelectedItem, rPropSet ) );
         GetExport().Characters( sPresentation );
     }
     break;
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index f5985703d2..e220a6d48c 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: txtfldi.cxx,v $
  *
- *  $Revision: 1.60 $
+ *  $Revision: 1.61 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2007-01-30 14:52:35 $
+ *  last change: $Author: rt $ $Date: 2007-02-01 10:06:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -345,8 +345,6 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
 {
     { XML_NAMESPACE_TEXT, XML_FIXED, XML_TOK_TEXTFIELD_FIXED },
     { XML_NAMESPACE_TEXT, XML_DESCRIPTION,	XML_TOK_TEXTFIELD_DESCRIPTION },
-    { XML_NAMESPACE_TEXT, XML_HELP,	XML_TOK_TEXTFIELD_HELP },
-    { XML_NAMESPACE_TEXT, XML_HINT,	XML_TOK_TEXTFIELD_HINT },
     { XML_NAMESPACE_TEXT, XML_PLACEHOLDER_TYPE,
                 XML_TOK_TEXTFIELD_PLACEHOLDER_TYPE },
     { XML_NAMESPACE_TEXT, XML_NAME, XML_TOK_TEXTFIELD_NAME },
@@ -4031,13 +4029,9 @@ XMLDropDownFieldImportContext::XMLDropDownFieldImportContext(
     sName(),
     nSelected( -1 ),
     bNameOK( false ),
-    bHelpOK(false),
-    bHintOK(false),
     sPropertyItems( RTL_CONSTASCII_USTRINGPARAM( "Items" ) ),
     sPropertySelectedItem( RTL_CONSTASCII_USTRINGPARAM( "SelectedItem" ) ),
-    sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ),
-    sPropertyHelp( RTL_CONSTASCII_USTRINGPARAM( "Help" ) ),
-    sPropertyToolTip( RTL_CONSTASCII_USTRINGPARAM( "Tooltip" ) )
+    sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "Name" ) )
 {
     bValid = sal_True;
 }
@@ -4103,18 +4097,9 @@ void XMLDropDownFieldImportContext::ProcessAttribute(
         sName = sAttrValue;
         bNameOK = true;
     }
-    else if (nAttrToken == XML_TOK_TEXTFIELD_HELP)
-    {
-        sHelp = sAttrValue;
-        bHelpOK = true;
-    }
-    else if (nAttrToken == XML_TOK_TEXTFIELD_HINT)
-    {
-        sHint = sAttrValue;
-        bHintOK = true;
-    }
 }
 
+
 void XMLDropDownFieldImportContext::PrepareField( 
     const Reference<XPropertySet>& xPropertySet)
 {
@@ -4143,19 +4128,6 @@ void XMLDropDownFieldImportContext::PrepareField(
         aAny <<= sName;
         xPropertySet->setPropertyValue( sPropertyName, aAny );
     }
-    // set help
-    if( bHelpOK )
-    {
-        aAny <<= sHelp;
-        xPropertySet->setPropertyValue( sPropertyHelp, aAny );
-    }
-    // set hint
-    if( bHintOK )
-    {
-        aAny <<= sHint;
-        xPropertySet->setPropertyValue( sPropertyToolTip, aAny );
-    }
-    
 }
 
 /** import header fields (<draw:header>) */
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index f824ccb91d..73b9a74714 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: txtvfldi.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: hbrinkm $ $Date: 2007-01-30 14:53:51 $
+ *  last change: $Author: rt $ $Date: 2007-02-01 10:06:05 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -136,8 +136,6 @@ static const sal_Char sAPI_fieldmaster_database[] = "com.sun.star.text.FieldMast
 
 // property names
 static const sal_Char sAPI_hint[] 				= "Hint";
-static const sal_Char sAPI_help[] 				= "Help";
-static const sal_Char sAPI_tooltip[] 			= "Tooltip";
 static const sal_Char sAPI_content[]			= "Content";
 static const sal_Char sAPI_sub_type[]			= "SubType";
 static const sal_Char sAPI_is_expression[]		= "IsExpression";
@@ -179,15 +177,12 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
     const sal_Char* pServiceName, sal_uInt16 nPrfx, 
     const OUString& rLocalName, 
     sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault, 
-    sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible, 
-    sal_Bool bIsDisplayFormula, 
+    sal_Bool bDescription, sal_Bool bVisible, sal_Bool bIsDisplayFormula, 
     sal_Bool bType, sal_Bool bStyle, sal_Bool bValue,
     sal_Bool bPresentation) :
         XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, rLocalName),
         sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content)),
         sPropertyHint(RTL_CONSTASCII_USTRINGPARAM(sAPI_hint)),
-        sPropertyHelp(RTL_CONSTASCII_USTRINGPARAM(sAPI_help)),
-        sPropertyTooltip(RTL_CONSTASCII_USTRINGPARAM(sAPI_tooltip)),
         sPropertyIsVisible(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_visible)),
         sPropertyIsDisplayFormula(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_show_formula)),
         sPropertyCurrentPresentation(RTL_CONSTASCII_USTRINGPARAM(sAPI_current_presentation)),
@@ -197,15 +192,11 @@ XMLVarFieldImportContext::XMLVarFieldImportContext(
         bNameOK(sal_False),
         bFormulaOK(sal_False),
         bDescriptionOK(sal_False),
-        bHelpOK(sal_False),
-        bHintOK(sal_False),
         bDisplayOK(sal_False),
         bSetName(bName), 
         bSetFormula(bFormula),
         bSetFormulaDefault(bFormulaDefault),
         bSetDescription(bDescription),
-        bSetHelp(bHelp),
-        bSetHint(bHint),
         bSetVisible(bVisible),
         bSetDisplayFormula(bIsDisplayFormula),
         bSetPresentation(bPresentation)
@@ -227,14 +218,6 @@ void XMLVarFieldImportContext::ProcessAttribute(
             sDescription = sAttrValue;
             bDescriptionOK = sal_True;
             break;
-        case XML_TOK_TEXTFIELD_HELP:
-            sHelp = sAttrValue;
-            bHelpOK = true;
-            break;
-        case XML_TOK_TEXTFIELD_HINT:
-            sHint = sAttrValue;
-            bHintOK = true;
-            break;
         case XML_TOK_TEXTFIELD_FORMULA:
             {
                 OUString sTmp;
@@ -306,20 +289,6 @@ void XMLVarFieldImportContext::PrepareField(
         xPropertySet->setPropertyValue(sPropertyHint, aAny);
     }
 
-    if (bSetHelp && bHelpOK)
-    {
-        Any aAny;
-        aAny <<= sHelp;
-        xPropertySet->setPropertyValue(sPropertyHelp, aAny);        
-    }
-
-    if (bSetHint && bHintOK)
-    {
-        Any aAny;
-        aAny <<= sHint;
-        xPropertySet->setPropertyValue(sPropertyTooltip, aAny);        
-    }
-
     if (bSetVisible && bDisplayOK)
     {
         Any aAny;
@@ -374,12 +343,12 @@ XMLSetVarFieldImportContext::XMLSetVarFieldImportContext(
     const sal_Char* pServiceName, sal_uInt16 nPrfx, 
     const OUString& rLocalName, VarType eVarType,
     sal_Bool bName, sal_Bool bFormula, sal_Bool bFormulaDefault, 
-    sal_Bool bDescription, sal_Bool bHelp, sal_Bool bHint, sal_Bool bVisible, sal_Bool bIsDisplayFormula,
+    sal_Bool bDescription, sal_Bool bVisible, sal_Bool bIsDisplayFormula,
     sal_Bool bType, sal_Bool bStyle, sal_Bool bValue, sal_Bool bPresentation) :
         XMLVarFieldImportContext(rImport, rHlp, pServiceName, 
                                  nPrfx, rLocalName,
                                  bName, bFormula, bFormulaDefault, 
-                                 bDescription, bHelp, bHint, bVisible, bIsDisplayFormula, 
+                                 bDescription, bVisible, bIsDisplayFormula, 
                                  bType, bStyle, bValue, bPresentation),
         eFieldType(eVarType)
 {
@@ -464,8 +433,7 @@ XMLSequenceFieldImportContext::XMLSequenceFieldImportContext(
                                     nPrfx, rLocalName, VarTypeSequence,
                                     // name, formula
                                     sal_True, sal_True, sal_True, 
-                                    sal_False, sal_False, sal_False, sal_False,
-                                    sal_False,
+                                    sal_False, sal_False, sal_False,
                                     sal_False, sal_False, sal_False, sal_True),
 
         sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format)),
@@ -538,8 +506,7 @@ XMLVariableSetFieldImportContext::XMLVariableSetFieldImportContext(
                                     // name, formula, value&type, style, 
                                     // display none
                                     sal_True, sal_True, sal_True, 
-                                    sal_False, sal_False, sal_False, 
-                                    sal_True, sal_False,
+                                    sal_False, sal_True, sal_False,
                                     sal_True, sal_True, sal_True,
                                     sal_True),
         sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
@@ -574,8 +541,7 @@ XMLVariableInputFieldImportContext::XMLVariableInputFieldImportContext(
                                     // name, description, display none/formula,
                                     // value&type, style, formula
                                     sal_True, sal_True, sal_True, 
-                                    sal_True, sal_True, sal_True,
-                                    sal_True, sal_False,
+                                    sal_True, sal_True, sal_False,
                                     sal_True, sal_True, sal_True, 
                                     sal_True),
         sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type)),
@@ -615,8 +581,7 @@ XMLUserFieldImportContext::XMLUserFieldImportContext(
                                     rLocalName, VarTypeUserField,
                                     // name, display none/formula, style
                                     sal_True, sal_False, sal_False, 
-                                    sal_False, sal_False, sal_False, sal_True, 
-                                    sal_True,
+                                    sal_False, sal_True, sal_True,
                                     sal_False, sal_True, sal_False, 
                                     sal_False)
 {
@@ -638,7 +603,6 @@ XMLUserFieldInputImportContext::XMLUserFieldInputImportContext(
                                  nPrfx, rLocalName, 
                                  // name, description, style
                                  sal_True, sal_False, sal_False,
-                                 sal_False, sal_False,
                                  sal_True, sal_False, sal_False,
                                  sal_False /*???*/, sal_True, sal_False,
                                  sal_False)
@@ -670,8 +634,7 @@ XMLVariableGetFieldImportContext::XMLVariableGetFieldImportContext(
                                  nPrfx, rLocalName,
                                  // name, style, display formula
                                  sal_True, sal_False, sal_False, 
-                                 sal_False, sal_False, sal_False,
-                                 sal_False, sal_True,
+                                 sal_False, sal_False, sal_True,
                                  sal_True, sal_True, sal_False,
                                  sal_True),
         sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
@@ -709,8 +672,7 @@ XMLExpressionFieldImportContext::XMLExpressionFieldImportContext(
                                  nPrfx, rLocalName,
                                  // formula, type, style, display formula
                                  sal_False, sal_True, sal_True, 
-                                 sal_False, sal_False, sal_False, 
-                                 sal_False, sal_True, 
+                                 sal_False, sal_False, sal_True, 
                                  sal_True, sal_True, sal_False,
                                  sal_True),
         sPropertySubType(RTL_CONSTASCII_USTRINGPARAM(sAPI_sub_type))
@@ -746,8 +708,7 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext(
                                  nPrfx, sLocalName,
                                  // description
                                  sal_False, sal_False, sal_False,
-                                 sal_True, sal_True, sal_True,
-                                 sal_False, sal_False,
+                                 sal_True, sal_False, sal_False,
                                  sal_False, sal_False, sal_False,
                                  sal_False),
         sPropertyContent(RTL_CONSTASCII_USTRINGPARAM(sAPI_content))