diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-02-05 17:32:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-05 17:36:48 +0100 |
| commit | ff26f022b36002c4f3ad426d8f37313e2651ae75 (patch) | |
| tree | d000457107947e56ae535c9b2e2ccc29f735f10c /xmlscript | |
| parent | dafcf0231f4ee9912fb264430da958e9cb09ab20 (diff) | |
xmlscript: fix import/export of dialog radio-buttons
The BASIC dialog format is not specified by ODF anyway, so the change
was particularly stupid.
(regression from 2d4b87f0c1bfd97185a89c18d5b7680d11a958d6)
Change-Id: I5b20d690093b0d2b898f3e45cc0292fb72fbb353
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, 3 insertions, 6 deletions
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 066cfd3a5b7b..dc5d0b79648f 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -419,6 +419,7 @@ 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 c1e8a3927eb4..6f2c6ea8393b 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -1178,9 +1178,7 @@ void TitledBoxElement::endElement() ctx.importImageURLProperty( "ImageURL" , "image-src" , _xAttributes ); ctx.importImagePositionProperty( "ImagePosition", "image-position", xAttributes ); ctx.importBooleanProperty( "MultiLine", "multiline", xAttributes ); - // map invalid "group-name" attribute to "name" - // (since radio buttons are grouped by name) - ctx.importStringProperty( "Name", "group-name", xAttributes ); + ctx.importStringProperty( "GroupName", "group-name", xAttributes ); sal_Int16 nVal = 0; sal_Bool bChecked = sal_False; @@ -1275,9 +1273,7 @@ void RadioGroupElement::endElement() ctx.importImageURLProperty( "ImageURL" , "image-src" , xAttributes ); ctx.importImagePositionProperty( "ImagePosition", "image-position", xAttributes ); ctx.importBooleanProperty( "MultiLine", "multiline", xAttributes ); - // map invalid "group-name" attribute to "name" - // (since radio buttons are grouped by name) - ctx.importStringProperty( "Name", "group-name", xAttributes ); + ctx.importStringProperty( "GroupName", "group-name", xAttributes ); sal_Int16 nVal = 0; sal_Bool bChecked = sal_False; if (getBoolAttr( &bChecked, "checked", xAttributes, _pImport->XMLNS_DIALOGS_UID ) && bChecked) |