diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-18 18:08:37 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-12-02 10:45:36 +0100 |
| commit | 53824b05f99ac7c68e6d48b53e2bd98c0fe274c7 (patch) | |
| tree | 2aff9ea7f2bd9a99ecf3f0fbd43758a641da50f6 /xmlscript | |
| parent | d8ae4e4a74cfd3b7e997c2132fdc41a812be8069 (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 'xmlscript')
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 1 | ||||
| -rw-r--r-- | xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 00d575ef8075..e71389b2aee0 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -427,7 +427,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 47ee825a723f..3963e599bf6b 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -1177,7 +1177,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; @@ -1272,7 +1274,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) |