diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-02-06 17:03:45 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2024-02-07 22:57:27 +0100 |
commit | 8e9d69f353118f7152e2dbad932f301fb9a1cf00 (patch) | |
tree | 5563d2dfba82edc8115b8acd5ec240011ef5e7e5 /include | |
parent | 34b0150df174e23d02190dc00e51b67be1f670dc (diff) |
tdf#157042: Revert "re-apply "optimize ConfigurationProperty::get()""
This reverts commit 3a4a00a51acca8f9b5e775547abff0c4dc9144d7.
it's causing https://crashreport.libreoffice.org/stats/signature/%3Cname%20omitted%3E
in libreoffice-24-2 branch ( See
https://bugs.documentfoundation.org/show_bug.cgi?id=157042#c36 )
In previous branches, it was reported as
https://crashreport.libreoffice.org/stats/signature/void%20rtl::str::release%3C_rtl_uString%3E(_rtl_uString*)
See comment in 7b46c77366fb3effd2de9bf5ba11ebd3c064974a
"tdf#157042: Revert "re-apply "optimize ConfigurationProperty::get()""
Change-Id: I3481c05b12b422404a38f0be1fea1ea69ffd0e46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163061
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/comphelper/configuration.hxx | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx index 652e9afaa640..51106a0a12c3 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 { @@ -85,17 +80,14 @@ private: namespace detail { -class ConfigurationChangesListener; - /// @internal class COMPHELPER_DLLPUBLIC ConfigurationWrapper { -friend class ConfigurationChangesListener; public: static ConfigurationWrapper const & get(); 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, @@ -143,12 +135,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 |