toolkit/source/controls/tabpagemodel.cxx | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit aa7b71cd17898cd47f4bd7f12cfe5036cd40cb57 Author: Vasily Melenchuk <[email protected]> AuthorDate: Wed Jan 23 15:11:38 2019 +0300 Commit: Michael Stahl <[email protected]> CommitDate: Wed Feb 6 11:23:58 2019 +0100 tdf#87884: basic: fix for UnknownPropertyException UnoControlTabPageModel had no USERFOMRCONTAINERS property and this was causing an exception during any attempt to set its properties. Change-Id: Icc432d7a431ecd861ac4f00a96ec75165bec168c Reviewed-on: https://gerrit.libreoffice.org/66801 Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> (cherry picked from commit 3deab788199395712b7d4641be5b11623b2ed964) Reviewed-on: https://gerrit.libreoffice.org/67398 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index e5afd1c4be25..044da501575e 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -55,6 +55,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c ImplRegisterProperty( BASEPROPERTY_TITLE ); ImplRegisterProperty( BASEPROPERTY_HELPTEXT ); ImplRegisterProperty( BASEPROPERTY_HELPURL ); + ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES ); } OUString SAL_CALL UnoControlTabPageModel::getImplementationName() @@ -84,6 +85,12 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const case BASEPROPERTY_DEFAULTCONTROL: aAny <<= OUString("com.sun.star.awt.tab.UnoControlTabPage"); break; + case BASEPROPERTY_USERFORMCONTAINEES: + { + // We do not have here any usercontainers (yet?), but let's return something back + // so normal properties could be set without triggering UnknownPropertyException + return makeAny(true); + } default: aAny = UnoControlModel::ImplGetDefaultValue( nPropId ); } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
