filter/source/config/cache/typedetection.cxx | 2 +- include/comphelper/sequenceashashmap.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit cfffcbc39b2c6794eaeddae5134fb59848a76d41 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Jun 15 09:18:30 2024 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Jun 15 08:56:58 2024 +0200 Simplify a bit Change-Id: Iae8af8904a445a523c1aecda6777ea4e2ce30598 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168900 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 0f655cfa7709..4fb9ab482571 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -928,7 +928,7 @@ OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& r { // tdf#161573: do not interact with the user about possible unrelated failures (e.g., // missing file). If needed, that will happen later, in the main detection phase. - auto aInteraction(rDescriptor.getValue(utl::MediaDescriptor::PROP_INTERACTIONHANDLER)); + auto aInteraction(rDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER]); rDescriptor.erase(utl::MediaDescriptor::PROP_INTERACTIONHANDLER); comphelper::ScopeGuard interactionHelperGuard([&rDescriptor, &aInteraction] { rDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER] = aInteraction; }); commit 6b3712dc0077644a28368592c5856e9914838dd7 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Jun 15 09:17:40 2024 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Jun 15 08:56:49 2024 +0200 SequenceAsHashMap::contains can be const Change-Id: I1f908eec2b8b809f5d1d9f8cac27bac9ba60df8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168899 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx index 35c068ed30d4..e0de5ead44f8 100644 --- a/include/comphelper/sequenceashashmap.hxx +++ b/include/comphelper/sequenceashashmap.hxx @@ -405,7 +405,7 @@ class SAL_WARN_UNUSED COMPHELPER_DLLPUBLIC SequenceAsHashMap return m_aMap.find(rKey); } - bool contains(const OUString& rKey) + bool contains(const OUString& rKey) const { return m_aMap.contains(rKey); }
