summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2024-02-08 17:10:03 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2024-02-08 21:33:15 +0100
commitcfcd6b25575087366924e39cf352bf3bb3853d6a (patch)
tree6443162560062c58b0f3bf90437f6e0a9abf5d86 /include
parentc2c651ee229a1d153cf515777d018ca6eda55d98 (diff)
tdf#157042: Revert "re-apply "optimize ConfigurationProperty::get()""
This reverts commit 3a4a00a51acca8f9b5e775547abff0c4dc9144d7. <x1sc0> noelgrandin, regarding tdf#157042, the commit was reverted in 24-2 and 7-6 branches but not in master so I was wondering what to do next. There are clear steps on how to reproduce it in comment 27 but it seems the crash is not reproducible with a debug build ( according to comment 37 ) <noelgrandin> x1sc0, let me try to reproduce that <noelgrandin> x1sc0, I cant reproduce, please just revert that on master Change-Id: I45dcf8f4b422e1a19eaa41ec7614db569b5aac7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163125 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
-rw-r--r--include/comphelper/configuration.hxx22
1 files changed, 4 insertions, 18 deletions
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index f248decad3a5..ede1af3c68be 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -12,16 +12,15 @@
#include <sal/config.h>
+#include <optional>
+#include <string_view>
+
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
#include <comphelper/processfactory.hxx>
#include <sal/types.h>
#include <memory>
-#include <mutex>
-#include <optional>
-#include <string_view>
-#include <unordered_map>
namespace com::sun::star {
namespace configuration { class XReadWriteAccess; }
@@ -32,10 +31,6 @@ namespace com::sun::star {
class XNameContainer;
}
namespace uno { class XComponentContext; }
- namespace util {
- class XChangesListener;
- class XChangesNotifier;
- }
}
namespace comphelper {
@@ -87,18 +82,15 @@ private:
namespace detail {
-class ConfigurationChangesListener;
-
/// @internal
class COMPHELPER_DLLPUBLIC ConfigurationWrapper {
-friend class ConfigurationChangesListener;
public:
static ConfigurationWrapper const & get(
css::uno::Reference<css::uno::XComponentContext> const & context);
bool isReadOnly(OUString const & path) const;
- css::uno::Any getPropertyValue(OUString const & path) const;
+ css::uno::Any getPropertyValue(std::u16string_view path) const;
static void setPropertyValue(
std::shared_ptr< ConfigurationChanges > const & batch,
@@ -147,12 +139,6 @@ private:
// css.beans.XHierarchicalPropertySetInfo), but then
// configmgr::Access::asProperty() would report all properties as
// READONLY, so isReadOnly() would not work
-
- mutable std::mutex maMutex;
- bool mbDisposed;
- mutable std::unordered_map<OUString, css::uno::Any> maPropertyCache;
- css::uno::Reference< css::util::XChangesNotifier > maNotifier;
- css::uno::Reference< css::util::XChangesListener > maListener;
};
/// @internal