[Libreoffice-commits] core.git: 2 commits - include/tools sfx2/source

[Caolán McNamara (via logerrit)]

 include/tools/color.hxx         |   13 ++++++++-----
 sfx2/source/control/request.cxx |    2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 65b00b25ecf901a13a9c3c660629dfefa998e7b0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Nov 16 20:40:27 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Nov 17 18:12:22 2019 +0100

    only need xTransform if we have xRecorder
    
    Change-Id: I6d1ad119921cf79cf87566d65b4dd700c0890fa7
    Reviewed-on: https://gerrit.libreoffice.org/83003
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index ec3d36eb4467..81247b4395ad 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -394,7 +394,7 @@ void SfxRequest::Record_Impl
     pImpl->pShell = &rSh;
     pImpl->pSlot = &rSlot;
     pImpl->xRecorder = xRecorder;
-    if (!pImpl->xTransform)
+    if (pImpl->xRecorder && !pImpl->xTransform)
         pImpl->xTransform = util::URLTransformer::create(comphelper::getProcessComponentContext());
     pImpl->aTarget = rSh.GetName();
     pImpl->pViewFrame = pViewFrame;
commit 7e19e07526f8c1ca94555e3e9a2211b9555f54b2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Nov 17 13:43:32 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Nov 17 18:12:10 2019 +0100

    cid#1455745 Not restoring ostream format
    
    Change-Id: Ie5b73bca282a279a0318e42499d44f19822b1554
    Reviewed-on: https://gerrit.libreoffice.org/83017
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index fa62f28f362b..cf11e0ae9df2 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -320,11 +320,14 @@ constexpr ::Color COL_AUTHOR9_LIGHT           ( 255,  231, 199 );
 template<typename charT, typename traits>
 inline std::basic_ostream<charT, traits>& operator <<(std::basic_ostream<charT, traits>& rStream, const Color& rColor)
 {
-    return rStream << "c[" << std::hex << std::setfill ('0')
-                   << std::setw(2) << static_cast<int>(rColor.GetRed())
-                   << std::setw(2) << static_cast<int>(rColor.GetGreen())
-                   << std::setw(2) << static_cast<int>(rColor.GetBlue())
-                   << std::setw(2) << static_cast<int>(rColor.GetTransparency()) << "]";
+    std::ios_base::fmtflags nOrigFlags = rStream.flags();
+    rStream << "c[" << std::hex << std::setfill ('0')
+            << std::setw(2) << static_cast<int>(rColor.GetRed())
+            << std::setw(2) << static_cast<int>(rColor.GetGreen())
+            << std::setw(2) << static_cast<int>(rColor.GetBlue())
+            << std::setw(2) << static_cast<int>(rColor.GetTransparency()) << "]";
+    rStream.setf(nOrigFlags);
+    return rStream;
 }
 
 #endif