core.git: 2 commits - sd/source unotest/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/unoidl/unomodel.cxx                                   |    2 +-
 unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx |    6 
+++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit cd5dcc6e43c669d99133b8de7d8559ba3145ba6d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 08:37:31 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 15:37:15 2024 +0200

    cid#1619687 Not restoring ostream format
    
    Change-Id: Id46d2317a0eeef612836fc58dc9da18cf7ee99a1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173894
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx 
b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 6811c9470104..5273699f57ab 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -88,9 +88,13 @@ void printUnoValue(
         out << std::uppercase << *o3tl::forceAccess<double>(value);
         break;
     case css::uno::TypeClass_CHAR:
+    {
+        std::ios_base::fmtflags origfmt = out.flags();
         out << "\u" << std::hex << std::uppercase << std::setw(4) << 
std::setfill('0')
-            << std::uint_least16_t(*o3tl::forceAccess<char16_t>(value)) << 
std::dec;
+            << std::uint_least16_t(*o3tl::forceAccess<char16_t>(value));
+        out.setf(origfmt);
         break;
+    }
     case css::uno::TypeClass_STRING:
         out << '"' << *o3tl::forceAccess<OUString>(value) << '"'; //TODO: 
encode content
         break;
commit 82584fe1b9976a6aafc84d5d0233b46eac7656a2
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 08:30:52 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 15:37:07 2024 +0200

    cid#1619686 Invalid iterator comparison
    
    Change-Id: I731cc791b1efab895bddbea9a235a9add3288058
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173893
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index e7951d7f75b1..b8f752199f4b 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -548,7 +548,7 @@ constexpr bool convertEnum(OStringBuffer& rBuffer, EnumT 
nValue,
                            const frozen::unordered_map<EnumT, 
std::string_view, N>& rMap)
 {
     auto iterator = rMap.find(nValue);
-    if (iterator == constAnimationNodeTypeToString.end())
+    if (iterator == rMap.end())
         return false;
     rBuffer.append(iterator->second);
     return true;