desktop/source/deployment/misc/dp_ucb.cxx | 4 ++-- extensions/source/propctrlr/propertyhandler.hxx | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 62da1fde05ca2c4d13b294699e5672743e9a95d8 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Mon Oct 22 15:14:57 2018 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Oct 22 17:48:21 2018 +0200 pvs-studio: V670 The uninitialized class member 'm_aMutex' is used Change-Id: I7ac2662afe77e6e9170b004b335635f97ae03692 Reviewed-on: https://gerrit.libreoffice.org/62184 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx index 325f207a2312..da77b687e24f 100644 --- a/extensions/source/propctrlr/propertyhandler.hxx +++ b/extensions/source/propctrlr/propertyhandler.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/inspection/XPropertyHandler.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <osl/interlck.h> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/uno3.hxx> @@ -69,7 +70,8 @@ namespace pcr > PropertyHandler_Base; /** the base class for property handlers */ - class PropertyHandler : public PropertyHandler_Base + class PropertyHandler : public ::cppu::BaseMutex + , public PropertyHandler_Base { private: /// cache for getSupportedProperties @@ -82,7 +84,6 @@ namespace pcr PropertyChangeListeners m_aPropertyListeners; protected: - mutable ::osl::Mutex m_aMutex; /// the context in which the instance was created css::uno::Reference< css::uno::XComponentContext > m_xContext; /// the component we're inspecting commit b1faaf7335d2c7bb951c1170e66ee6aab9d37e66 Author: Tor Lillqvist <t...@collabora.com> AuthorDate: Mon Oct 22 18:46:09 2018 +0300 Commit: Tor Lillqvist <t...@collabora.com> CommitDate: Mon Oct 22 18:47:35 2018 +0300 Put quotes around a URL in a message to make it more obvious if it is empty Change-Id: I03fe3f70ee97066d9c2083d4ef091c501f241392 diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 017aad657279..75bbbe843142 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -103,7 +103,7 @@ bool create_folder( // invalid: has to be at least "auth:/..." if (throw_exc) throw ContentCreationException( - "Cannot create folder (invalid path): " + url, + "Cannot create folder (invalid path): '" + url + "'", Reference<XInterface>(), ContentCreationError_UNKNOWN ); return false; } @@ -154,7 +154,7 @@ bool create_folder( } if (throw_exc) throw ContentCreationException( - "Cannot create folder: " + url, + "Cannot create folder: '" + url + "'", Reference<XInterface>(), ContentCreationError_UNKNOWN ); return false; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits