diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-12 11:09:06 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-12 11:20:04 +0200 |
| commit | fb0b42b89af95b42cc6caadf8c22321e5c9386e8 (patch) | |
| tree | f5315ca97121ac6705edf8767e4f372f1ff629fd | |
| parent | c2e708d61746a259888c0e5fb1d3e9a43e3ca696 (diff) | |
CppunitTest_tiledrendering: disable SwVirtFlyDrawObj assert for now
Change-Id: I289632e4e686b56d83855a0a5c69744b3b7e035e
| -rw-r--r-- | sw/inc/viewsh.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 14b7982a211c..a0b96133f802 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 bc043ed7b189..c8177a9f1ced 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. |