summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasily Melenchuk <vasily.melenchuk@cib.de>2019-02-06 00:41:25 +0300
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-04-04 15:02:17 +0200
commitb8412f1d8b70ee097f8cf00bf159514bd443ea07 (patch)
tree878dc34a0935f884bac4714c42d642661d64b0cb
parenta072b91c03f7e24cc5fe99e4b7462d37ef8d703b (diff)
basic: fix for UnoControlTabPageModel get/set properties
The userformscontainers is required property to pass checks in getter/setter, but returning true instead of actual type is not a best idea. So let's return actually expected dummy empty container. Change-Id: I5cc3e5462ed82f6f2f8e5a45d9fc2d9f9ce1c76f Reviewed-on: https://gerrit.libreoffice.org/67431 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 24e7d98219191ccdab3673ac96fa866c449cac5f) Reviewed-on: https://gerrit.libreoffice.org/70235 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--toolkit/source/controls/tabpagemodel.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx
index 044da501575e..5ddbe3d0f8ef 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -87,9 +87,10 @@ Any UnoControlTabPageModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
break;
case BASEPROPERTY_USERFORMCONTAINEES:
{
- // We do not have here any usercontainers (yet?), but let's return something back
+ // We do not have here any usercontainers (yet?), but let's return empty container back
// so normal properties could be set without triggering UnknownPropertyException
- return makeAny(true);
+ aAny <<= uno::Reference< XNameContainer >();
+ break;
}
default:
aAny = UnoControlModel::ImplGetDefaultValue( nPropId );