diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-09-29 14:38:31 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-10-11 09:48:03 +0200 |
| commit | 048b8e45813f6a19a4ff56e1d676fe9450325cd2 (patch) | |
| tree | 473a10bbf7f559afae949060a131046dc1c4ce6a /oox/source/ole | |
| parent | 0f26c6ddda31221364b011a0b89286ecea303d89 (diff) | |
tdf#111980 oox optionbutton autoGroup inside GroupBox
The area of a GroupBox indicates which radio buttons
are considered to be part of the same group. The
button needs to be fully inside of the groupbox
in order to participate. This patch resolves the last
worry of commit 9f969799629fe6bdf8b922d8cb922846aa646ece
Change-Id: Ie6057337c63bf9eb173a0615e30c8d4e4d0c7a19
Reviewed-on: https://gerrit.libreoffice.org/61131
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox/source/ole')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 350fe0e315f9..563cf06e5a54 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -1555,13 +1555,8 @@ void AxMorphDataModelBase::convertProperties( PropertyMap& rPropMap, const Contr rConv.convertColor( rPropMap, PROP_TextColor, mnTextColor ); if ( mnDisplayStyle == AX_DISPLAYSTYLE_OPTBUTTON ) { - // 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. + // If unspecified, radio buttons autoGroup in the same document/sheet + // NOTE: form controls should not autoGroup with ActiveX controls - see drawingfragment.cxx OUString sGroupName = !maGroupName.isEmpty() ? maGroupName : "autoGroup_"; rPropMap.setProperty( PROP_GroupName, sGroupName ); } |