[Libreoffice-commits] core.git: 3 commits - svx/source unotools/source vcl/quartz

[Tor Lillqvist]

 svx/source/sdr/contact/viewcontactofgraphic.cxx |    2 ++
 unotools/source/config/fltrcfg.cxx              |   16 ----------------
 vcl/quartz/salgdicommon.cxx                     |    2 --
 3 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit bd365a1056c73f4bd16edcb969c2b8c269ad6b6a
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 9 15:14:34 2014 +0300

    Enforce "swap-in" for now for iOS with tiled rendering
    
    Change-Id: I6c835aaca2c140cbbb6050b82278aeaaad06fc77

diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 4ec7825..81802df 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -375,6 +375,7 @@ namespace sdr
                 // with the content which is the placeholder graphic
                 xRetval = createVIP2DSForPresObj(aObjectMatrix, aAttribute);
             }
+#ifndef IOS // Enforce swap-in for tiled rendering for now, while we have no delayed updating mechanism
             else if(visualisationUsesDraft())
             {
                 // #i102380# The graphic is swapped out. To not force a swap-in here, there is a mechanism
@@ -384,6 +385,7 @@ namespace sdr
                 // (non-blocking) processing here and thus in the effect e.g. fast scrolling through pages
                 xRetval = createVIP2DSForDraft(aObjectMatrix, aAttribute);
             }
+#endif
             else
             {
                 // create primitive. Info: Calling the copy-constructor of GraphicObject in this
commit 29885b40df490196a9a74fea1d3b69300619e90b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 9 15:10:49 2014 +0300

    Revert special-casing tiled rendering here
    
    It seems to do more harm than good. Using the default avoids some yet
    not found bug in vcl (or somewhere) and fixes the rendering of some
    complex SmartArt test documents. (As long as the use of delayed
    rendering for "graphics" in svx is also disabled.)
    
    Change-Id: I0ed4b25278101bdd995ce90e8fb65f65ca644ebe

diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index dc8dbbd..6c2c473 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -584,24 +584,8 @@ void SvtFilterOptions::SetImpress2PowerPoint( bool bFlag )
     SetModified();
 }
 
-static bool lcl_DoTiledRendering()
-{
-#if !HAVE_FEATURE_DESKTOP
-    // We do tiled rendering only for iOS at the moment, actually, but
-    // let's see what happens if we assume it for Android, too.
-    return true;
-#else
-    // We need some way to know globally if this process will use
-    // tiled rendering or not. Or should this be a per-window setting?
-    // Or what?
-    return false;
-#endif
-}
-
 bool SvtFilterOptions::IsSmartArt2Shape() const
 {
-    if (lcl_DoTiledRendering())
-        return true;
     return pImp->IsFlag( FILTERCFG_SMARTART_SHAPE_LOAD );
 }
 
commit 39253f9aafd1668bef7fa19a6717b7d8bb749fb3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 9 14:17:58 2014 +0300

    Remove a couple of now unneeded includes
    
    Change-Id: I8da8687b09c5cf33ab79f77b00ed47ed022529f6

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 0311c46..ba80504 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -36,8 +36,6 @@
 
 #ifdef IOS
 #include "saldatabasic.hxx"
-#include "headless/svpbmp.hxx"
-#include <basegfx/range/b2ibox.hxx>
 #endif
 
 #if defined(IOS) && defined(DBG_UTIL)