diff options
| author | sj <sj@openoffice.org> | 2010-06-16 07:28:16 +0200 |
|---|---|---|
| committer | sj <sj@openoffice.org> | 2010-06-16 07:28:16 +0200 |
| commit | e316ce7a8f784231ff39bb069ec6eac0aefca9ce (patch) | |
| tree | e45881f88ba87230b09d3553595c09c709ce19e3 /xmloff/source/forms | |
| parent | 9508a731824e7f8a692d462da763b2db95463875 (diff) | |
| parent | 634bd66a83cffb00d41d434e77c80eef06a0c813 (diff) | |
impress186: merge with DEV300_m82
Diffstat (limited to 'xmloff/source/forms')
| -rw-r--r-- | xmloff/source/forms/elementexport.cxx | 5 | ||||
| -rw-r--r-- | xmloff/source/forms/valueproperties.cxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 88abf8ad988a..115b06c4c2ad 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -2034,10 +2034,7 @@ namespace xmloff OAttributeMetaData::getFormAttributeName(eStringPropertyIds[i]), aStringPropertyNames[i]); - // Since as per ODF 1.2, xlink:href and xlink:type need to exist either both or none, - // we need to write xlink:type, too, even if it carries no information. - // #i111035# / 2010-04-141/ frank.schoenheit@sun.com - AddAttributeASCII( XML_NAMESPACE_XLINK, "type", "simple" ); + // #i112082# xlink:type is added as part of exportTargetLocationAttribute // now export the data source name or databaselocation or connection resource ::rtl::OUString sPropValue; diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx index 3515dcf96010..1c44db963944 100644 --- a/xmloff/source/forms/valueproperties.cxx +++ b/xmloff/source/forms/valueproperties.cxx @@ -116,7 +116,7 @@ namespace xmloff void OValuePropertiesMetaData::getValueLimitPropertyNames(sal_Int16 _nFormComponentType, sal_Char const * & _rpMinValuePropertyName, sal_Char const * & _rpMaxValuePropertyName) { - _rpMinValuePropertyName = _rpMinValuePropertyName = NULL; + _rpMinValuePropertyName = _rpMaxValuePropertyName = NULL; switch (_nFormComponentType) { case FormComponentType::DATEFIELD: |