diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-18 18:08:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-20 16:40:14 +0200 |
| commit | 2d4b87f0c1bfd97185a89c18d5b7680d11a958d6 (patch) | |
| tree | 95ec0fff7ecffa989927d52126e86ee62ff92fcf /xmloff | |
| parent | f05273aa478135b199577877ecd16325e0df95d2 (diff) | |
ODF export: don't write invalid "group-name" attribute
Radio buttons are grouped via their "form:name" attribute already.
Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6
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, 4 insertions, 6 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 71128474db50..2a253172d3a8 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1159,11 +1159,9 @@ 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] ); @@ -1659,8 +1657,6 @@ 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 4da67a7e2500..57703c16dda2 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -76,9 +76,11 @@ 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); |