summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-12-03 14:11:34 -0800
committerAndras Timar <andras.timar@collabora.com>2014-12-03 14:11:34 -0800
commit62f144ef3b4e9e5d8cd9b624f86ff823380d425b (patch)
tree0066852fd0f69a6b454d553e5a9e45f580668179 /xmloff
parent2580fb2882343b7b80cc3c0317d8f99379cc8acb (diff)
Revert "ODF export: don't write invalid "group-name" attribute"cp-4.2-20
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/forms/elementexport.cxx4
-rw-r--r--xmloff/source/forms/layerimport.cxx6
2 files changed, 6 insertions, 4 deletions
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index 3118b19877c4..5d4e635fb33a 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 39c5b4c469fb..adc7998d4c67 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -78,11 +78,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);