diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-04-27 18:59:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-04-27 19:02:02 +0300 |
| commit | 4de9e22ce7f39936d1201fc35baac58445826819 (patch) | |
| tree | d5a558e083ea385a423357e583fc4c408d460b8b | |
| parent | rhbz#1215443 avoid null pointer dereference (diff) | |
| download | core-4de9e22ce7f39936d1201fc35baac58445826819.tar.gz core-4de9e22ce7f39936d1201fc35baac58445826819.zip | |
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
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 7713e3ae8e8b..b4eb8602a74d 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. |