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

[Tor Lillqvist]

 sw/source/core/draw/dflyobj.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4de9e22ce7f39936d1201fc35baac58445826819
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Apr 27 18:59:55 2015 +0300

    We run into this assertion too often when using LOKit
    
    So until somebody has the time to figure out what is really going on, just
    don't assert when being used from LOKit.
    
    Change-Id: I5c4a87b94e7bd7ffdbf90973387b61407b8e6c8d

diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 7713e3a..b4eb860 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "hintids.hxx"
+#include <comphelper/lok.hxx>
 #include <svx/svdtrans.hxx>
 #include <editeng/protitem.hxx>
 #include <editeng/opaqitem.hxx>
@@ -467,7 +468,7 @@ 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());
+            assert(comphelper::LibreOfficeKit::isActive() || !rViewInformation.getViewport().isEmpty());
             if ( !pFlyFrm->IsFlyInCntFrm() )
             {
                 // it is also necessary to restore the VCL MapMode from ViewInformation since e.g.