diff options
Diffstat (limited to 'oox/source/ole/axcontrol.cxx')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 2eab7a0fa861..350fe0e315f9 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -1554,7 +1554,17 @@ void AxMorphDataModelBase::convertProperties( PropertyMap& rPropMap, const Contr rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_FLAGS_ENABLED ) ); rConv.convertColor( rPropMap, PROP_TextColor, mnTextColor ); if ( mnDisplayStyle == AX_DISPLAYSTYLE_OPTBUTTON ) - rPropMap.setProperty( PROP_GroupName, maGroupName ); + { + // Form Radio Controls (non-ActiveX) have no group name, but autoGroup + // with their group box, or frame, or sheet, or document. + // So ensure that SOME name is given for a group name + // TODO: ActiveX controls without a Group name shouldn't autogroup + // with non-ActiveX option buttons. + // TODO: each application should test if control's area is fully inside + // a GroupBox, and give those a separate group name. + OUString sGroupName = !maGroupName.isEmpty() ? maGroupName : "autoGroup_"; + rPropMap.setProperty( PROP_GroupName, sGroupName ); + } AxFontDataModel::convertProperties( rPropMap, rConv ); } |