mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#117282 Do not set property 'Name' at ControlShape

Browse Source 
Formally property 'Name' was set at com.sun.star.drawing.ControlShape,
but this Shape does not (and never did) support that Property. It
should have thrown an UnknownPropertyException in the past, but did
not do that by error. It was just ignored in SvxShape::_setPropertyValue
and lost.
Solution is to just not set it anymore. This loses nothing (was never
set, see above), but avoids the (now correctly thrown) exception.

Change-Id: Id6bdc545862f91692213afe6fb706b98d3fce211
Reviewed-on: https://gerrit.libreoffice.org/54145
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
This commit is contained in:
Armin Le Grand
2018-05-11 18:17:10 +02:00
parent e89350cc1e
commit 66561e30bf
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/source/dbpilots/optiongrouplayouter.cxx
View File

@@ -148,8 +148,15 @@ namespace dbp
xRadioShape->setControl(Reference< XControlModel >(xRadioModel, UNO_QUERY));
// the name of the shape
if (xShapeProperties.is())
xShapeProperties->setPropertyValue("Name", makeAny(sElementsName));
// tdf#117282 com.sun.star.drawing.ControlShape *has* no property
// of type 'Name'. In older versions it was an error that this did
// not throw an UnknownPropertyException. Still, it was never set
// at the Shape/SdrObject and was lost.
// Thus - just do no tset it. It is/stays part of the FormControl
// data, so it will be shown in the FormControl dialogs. It is not
// shown/used in SdrObject::Name dialog (e.g. context menu/Name...)
// if (xShapeProperties.is())
// xShapeProperties->setPropertyValue("Name", makeAny(sElementsName));
// add to the page
xPageShapes->add(xRadioShape.get());