[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna]

 sw/inc/viewsh.hxx               |    1 +
 sw/source/core/draw/dflyobj.cxx |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit fb0b42b89af95b42cc6caadf8c22321e5c9386e8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Jul 12 11:09:06 2014 +0200

    CppunitTest_tiledrendering: disable SwVirtFlyDrawObj assert for now
    
    Change-Id: I289632e4e686b56d83855a0a5c69744b3b7e035e

diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 14b7982..a0b9613 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -571,6 +571,7 @@ public:
     bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return (eControl == Header)? mbShowHeaderSeparator: mbShowFooterSeparator; }
     virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) { if ( eControl == Header ) mbShowHeaderSeparator = bShow; else mbShowFooterSeparator = bShow; }
     bool IsSelectAll() { return mbSelectAll; }
+    bool IsTiledRendering() { return mbTiledRendering; }
 };
 
 // manages global ShellPointer
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index bc043ed..c8177a9 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -469,7 +469,9 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject(
             // if there's no viewport set, all fly-frames will be painted,
             // which is slow, wastes memory, and can cause other trouble.
             (void) rViewInformation; // suppress "unused parameter" warning
-            assert(!rViewInformation.getViewport().isEmpty());
+            if (!pShell->IsTiledRendering())
+                // FIXME is it OK to have no viewport during tiled rendering?
+                assert(!rViewInformation.getViewport().isEmpty());
             if ( !pFlyFrm->IsFlyInCntFrm() )
             {
                 // it is also necessary to restore the VCL MapMode from ViewInformation since e.g.