summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2019-01-23 15:11:38 +0300
committerMichael Stahl <Michael.Stahl@cib.de>2019-02-06 11:24:19 +0100
commit954c23f3393fc1d6e06687db8718f072723c8355 (patch)
tree6040411f91e9e3e47bd75e3b654dd93d0f904b10 /toolkit
parent80198e1da81bd23ab698ff73d2d758f648acdcef (diff)
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 <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 3deab788199395712b7d4641be5b11623b2ed964) Reviewed-on: https://gerrit.libreoffice.org/67399 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index ade7374176f8..dc1730ea04a7 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -54,6 +54,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< XComponentContext > c
ImplRegisterProperty( BASEPROPERTY_TITLE );
ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
ImplRegisterProperty( BASEPROPERTY_HELPURL );
+ ImplRegisterProperty( BASEPROPERTY_USERFORMCONTAINEES );
}
OUString SAL_CALL UnoControlTabPageModel::getImplementationName()
@@ -83,6 +84,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 );
}