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

[Noel Grandin (via logerrit)]

 sd/source/ui/view/sdwindow.cxx |    2 ++
 sfx2/source/appl/appuno.cxx    |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 80a3538d1e68b25fabd03d391ebe3d75e40681bf
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Apr 9 09:33:21 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Apr 9 12:00:43 2020 +0200

    tdf#104878 no need to generate invalidations if LOK off
    
    shows up in a small way on a perf trace
    
    Change-Id: Ia82606206c1a8fc1323b33f55d06e2a954eb1030
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91948
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 118f1545b186..671b52a3a49b 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1009,6 +1009,8 @@ void Window::LogicInvalidate(const ::tools::Rectangle* pRectangle)
     if (!pDrawViewShell || pDrawViewShell->IsInSwitchPage())
         return;
 
+    if (!comphelper::LibreOfficeKit::isActive())
+        return;
     OString sRectangle;
     if (!pRectangle)
         sRectangle = "EMPTY";
commit c6a26473f47c141026bf624668607f19394594ca
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Apr 9 09:44:37 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Apr 9 12:00:23 2020 +0200

    tdf#104878 avoid OUString allocation in TransformParameters
    
    tiny optimisation
    
    Change-Id: I26dd9ed8d11c98a00e704c5b2fc5bed5ac81552c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91950
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index ede87667adce..1bdb0c0e9831 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -294,9 +294,8 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
         if ( nSubCount == 0 )
         {
             // "simple" (base type) argument
-            auto aName = OUString( rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8 );
             auto pProp = std::find_if(rArgs.begin(), rArgs.end(),
-                [&aName](const beans::PropertyValue& rProp) { return rProp.Name == aName; });
+                [&rArg](const beans::PropertyValue& rProp) { return rProp.Name.equalsAscii(rArg.pName); });
             if (pProp != rArgs.end())
             {
 #ifdef DBG_UTIL