sc/source/filter/excel/xiescher.cxx | 3 ++-
xmloff/source/forms/elementexport.cxx | 4 ----
xmloff/source/forms/layerimport.cxx | 6 ++++--
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 1 -
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 8 ++++++--
5 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit e252913157146928f64d8594f8f142dd5966126c
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 18 18:08:37 2014 +0200
ODF export: don't write invalid "group-name" attribute
Radio buttons are grouped via their "form:name" attribute already.
Change-Id: I9f8b27a2904d947c3d4665495d36961e3e41d2c6
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 29897285..55df51e 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2287,7 +2287,8 @@ void XclImpOptionButtonObj::DoProcessControl(
ScfPropertySet& rPropSet ) const
ScfPropertySet aProps( xCtrlModel );
OUString sGroupName = OUString::number(
pLeader->GetDffShapeId() );
- aProps.SetStringProperty( "GroupName", sGroupName );
+ // for radio buttons, "Name" is the group name
+ aProps.SetStringProperty( "Name", sGroupName );
aProps.SetStringProperty( "RefValue", OUString::number(
nRefVal++ ) );
if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() )
{
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index 6a94b34..228e1d22 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -1158,11 +1158,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] );
@@ -1658,8 +1656,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 fa1ff91..ce6c4e2 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);
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
index e20fc17..531217d 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
@@ -424,7 +424,6 @@ void ElementDescriptor::readRadioButtonModel( StyleBag *
all_styles )
readImageURLAttr( "ImageURL", XMLNS_DIALOGS_PREFIX ":image-src" );
readImagePositionAttr( "ImagePosition", XMLNS_DIALOGS_PREFIX
":image-position" );
readBoolAttr( "MultiLine", XMLNS_DIALOGS_PREFIX ":multiline" );
- readStringAttr( "GroupName", XMLNS_DIALOGS_PREFIX ":group-name" );
sal_Int16 nState = 0;
if (readProp( "State" ) >>= nState)
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
index 214b17e..a6a1a87 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
@@ -1174,7 +1174,9 @@ void TitledBoxElement::endElement()
ctx.importImageURLProperty( "ImageURL" , "image-src" , _xAttributes );
ctx.importImagePositionProperty( "ImagePosition", "image-position",
xAttributes );
ctx.importBooleanProperty( "MultiLine", "multiline", xAttributes );
- ctx.importStringProperty( "GroupName", "group-name", xAttributes );
+ // map invalid "group-name" attribute to "name"
+ // (since radio buttons are grouped by name)
+ ctx.importStringProperty( "Name", "group-name", xAttributes );
sal_Int16 nVal = 0;
sal_Bool bChecked = sal_False;
@@ -1269,7 +1271,9 @@ void RadioGroupElement::endElement()
ctx.importImageURLProperty( "ImageURL" , "image-src" , xAttributes );
ctx.importImagePositionProperty( "ImagePosition", "image-position",
xAttributes );
ctx.importBooleanProperty( "MultiLine", "multiline", xAttributes );
- ctx.importStringProperty( "GroupName", "group-name", xAttributes );
+ // map invalid "group-name" attribute to "name"
+ // (since radio buttons are grouped by name)
+ ctx.importStringProperty( "Name", "group-name", xAttributes );
sal_Int16 nVal = 0;
sal_Bool bChecked = sal_False;
if (getBoolAttr( &bChecked, "checked", xAttributes,
_pImport->XMLNS_DIALOGS_UID ) && bChecked)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
