convert ODatabaseMetaDataResultSet to comphelper::WeakComponentImplHelper

Which means making a copy of comphelper::PropertyContainer

Change-Id: I14a61fa40e2c1dfc66833e00817025397584b3ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165345
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 65 insertions, 0 deletions

diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index d03dc06dd67f..2ab1b1bfa5d7 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
     comphelper/source/property/propagg \
     comphelper/source/property/propertybag \
     comphelper/source/property/propertycontainer \
+    comphelper/source/property/propertycontainer2 \
     comphelper/source/property/propertycontainerhelper \
     comphelper/source/property/property \
     comphelper/source/property/propertysethelper \
diff --git a/comphelper/source/property/propertycontainer2.cxx b/comphelper/source/property/propertycontainer2.cxx
new file mode 100644
index 000000000000..5a3bfa4be285
--- /dev/null
+++ b/comphelper/source/property/propertycontainer2.cxx
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <comphelper/propertycontainer2.hxx>
+#include <cppuhelper/typeprovider.hxx>
+
+namespace comphelper
+{
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::beans;
+
+OPropertyContainer2::OPropertyContainer2() {}
+
+OPropertyContainer2::~OPropertyContainer2() {}
+
+Sequence<Type> OPropertyContainer2::getBaseTypes()
+{
+    // just the types from our one and only base class
+    ::cppu::OTypeCollection aTypes(cppu::UnoType<XPropertySet>::get(),
+                                   cppu::UnoType<XFastPropertySet>::get(),
+                                   cppu::UnoType<XMultiPropertySet>::get());
+    return aTypes.getTypes();
+}
+
+bool OPropertyContainer2::convertFastPropertyValue(std::unique_lock<std::mutex>& /*rGuard*/,
+                                                   Any& _rConvertedValue, Any& _rOldValue,
+                                                   sal_Int32 _nHandle, const Any& _rValue)
+{
+    return OPropertyContainerHelper::convertFastPropertyValue(_rConvertedValue, _rOldValue,
+                                                              _nHandle, _rValue);
+}
+
+void OPropertyContainer2::setFastPropertyValue_NoBroadcast(std::unique_lock<std::mutex>& /*rGuard*/,
+                                                           sal_Int32 _nHandle, const Any& _rValue)
+{
+    OPropertyContainerHelper::setFastPropertyValue(_nHandle, _rValue);
+}
+
+void OPropertyContainer2::getFastPropertyValue(std::unique_lock<std::mutex>& /*rGuard*/,
+                                               Any& _rValue, sal_Int32 _nHandle) const
+{
+    OPropertyContainerHelper::getFastPropertyValue(_rValue, _nHandle);
+}
+
+} // namespace comphelper
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */