[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 8 11:12:25 UTC 2019


 vcl/source/gdi/impgraph.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 875f65ad5240b891ed1e5b3e17946816a4afe98a
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Thu Jul 4 15:05:41 2019 +0200
Commit:     Xisco FaulĂ­ <xiscofauli at libreoffice.org>
CommitDate: Mon Jul 8 13:11:43 2019 +0200

    tdf#121740 improve ppt load time on windows, reduce image swapout
    
    Reduces load time of this file by 10%.
    
    This logic is here since
          commit 8ab086b6cc054501bfbf7ef6fa509c393691e860
          Date:   Mon Sep 18 16:07:07 2000 +0000
          initial import
    and there does not seem to be any good reason to immediately trigger a swapout.
    
    Our balancing logic will perform a swapout as necessary.
    
    Change-Id: I02592dfd3bde1a00bcca2fcbcd4d38aacc8f3de4
    Reviewed-on: https://gerrit.libreoffice.org/75086
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit f2c3ea4f54d634ab54702d6fe07ccd4d4d76bdc1)
    Reviewed-on: https://gerrit.libreoffice.org/75203
    Reviewed-by: Xisco FaulĂ­ <xiscofauli at libreoffice.org>

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 5a621025423f..195e40d1a45a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1652,9 +1652,6 @@ void ImpGraphic::ImplSetLink(const std::shared_ptr<GfxLink>& rGfxLink)
     ensureAvailable();
 
     mpGfxLink = rGfxLink;
-
-    if (mpGfxLink && mpGfxLink->IsNative())
-        mpGfxLink->SwapOut();
 }
 
 GfxLink ImpGraphic::ImplGetLink()


More information about the Libreoffice-commits mailing list