diff options
author | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:06:36 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2007-03-09 12:06:36 +0000 |
commit | e881f2ec4b4509baea3745db25c8c7ef17941204 (patch) | |
tree | 484ee0ad1fd00a0b66fc2266adb4dddacb7d1fdd /xmloff/source/text/txtflde.cxx | |
parent | c63dfc35189235f169330c2a18772ee643bfaf09 (diff) |
INTEGRATION: CWS hb02 (1.69.28); FILE MERGED
2007/02/05 16:27:45 hbrinkm 1.69.28.1: #144146# new tokens help and hint
Diffstat (limited to 'xmloff/source/text/txtflde.cxx')
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 1ac8dea65a1c..cadd555007e4 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtflde.cxx,v $ * - * $Revision: 1.71 $ + * $Revision: 1.72 $ * - * last change: $Author: rt $ $Date: 2007-02-01 10:06:05 $ + * last change: $Author: obo $ $Date: 2007-03-09 13:06:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -467,7 +467,8 @@ 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(); @@ -1347,6 +1348,10 @@ 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; @@ -1897,12 +1902,17 @@ 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; |