diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-12-03 14:28:07 -0800 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-12-03 14:28:07 -0800 |
| commit | b09efb32073ad8a86af3b3ed6f3dcd276496ddf7 (patch) | |
| tree | 74f873eefd4d37ea16728b34d3a0b7589c1f4192 /xmloff | |
| parent | f810aa9d9945b52831378b4a7cd148853d2f2bb2 (diff) | |
Revert "ODF export: don't write invalid "group-name" attribute"
This reverts commit e252913157146928f64d8594f8f142dd5966126c.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/forms/elementexport.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/forms/layerimport.cxx | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 228e1d229159..6a94b3484c95 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1158,9 +1158,11 @@ namespace xmloff { static const sal_Int32 nStringPropertyAttributeIds[] = { // attribute flags + SCA_GROUP_NAME }; static const OUString pStringPropertyNames[] = { // property names + OUString(PROPERTY_GROUP_NAME) }; static const sal_Int32 nIdCount = sizeof( nStringPropertyAttributeIds ) / sizeof( nStringPropertyAttributeIds[0] ); @@ -1656,6 +1658,8 @@ namespace xmloff } if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) ) m_nIncludeSpecial |= SCA_IMAGE_POSITION; + if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_GROUP_NAME ) ) + m_nIncludeSpecial |= SCA_GROUP_NAME; m_nIncludeDatabase = DA_DATA_FIELD | DA_INPUT_REQUIRED; m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE; break; diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index ce6c4e291c8b..fa1ff91a3286 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -76,11 +76,9 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // string properties which are exported as attributes m_aAttributeMetaData.addStringProperty( OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME); - // map invalid "group-name" attribute to "name" - // (since radio buttons are grouped by name) - m_aAttributeMetaData.addStringProperty( - OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_NAME); m_aAttributeMetaData.addStringProperty( + OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_GROUP_NAME); + m_aAttributeMetaData.addStringProperty( OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL); m_aAttributeMetaData.addStringProperty( OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL); |