[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/source

[Vasily Melenchuk (via logerrit)]

 toolkit/source/controls/tabpagemodel.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b8412f1d8b70ee097f8cf00bf159514bd443ea07
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Wed Feb 6 00:41:25 2019 +0300
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Apr 4 15:02:17 2019 +0200

    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 at cib.de>
    (cherry picked from commit 24e7d98219191ccdab3673ac96fa866c449cac5f)
    Reviewed-on: https://gerrit.libreoffice.org/70235
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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 );