[Libreoffice-commits] core.git: uui/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 12 12:15:08 UTC 2019
uui/source/interactionhandler.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a07c637a0e4fe0ab81db70c69decbc946ad37da9
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Nov 12 11:17:08 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Nov 12 13:13:55 2019 +0100
getPropertySetInfo is allowed to return null
so the original state, without the assert, would be ok
css.beans.XPropertySet::getPropertySetInfo is documented as "@returns NULL if
the implementation cannot or will not provide information about the properties"
Change-Id: Ia0230add8f6c1b22a639cd71ca3cc310e0f1d126
Reviewed-on: https://gerrit.libreoffice.org/82499
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index c132e9152b1b..f90763e1e22e 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -30,7 +30,6 @@
#include "iahndl.hxx"
#include <comphelper/namedvaluecollection.hxx>
-#include <comphelper/propertysetinfo.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -100,7 +99,7 @@ public:
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo() override
{
- return new comphelper::PropertySetInfo;
+ return nullptr;
}
virtual void SAL_CALL setPropertyValue(const OUString& rPropertyName, const css::uno::Any& rValue) override
More information about the Libreoffice-commits
mailing list