diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-23 08:06:05 +0200 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-07-26 15:42:03 +0200 |
| commit | 2d4037529bb5b831907eabb85650126349595cc9 (patch) | |
| tree | 582248c891896a26aa7631fb70348993bf33cd68 | |
| parent | 20f6cf03770d8c5ca343287a42dc58df3091ef32 (diff) | |
Revert "CppunitTest_tiledrendering: disable SwVirtFlyDrawObj assert for now"
This is a real problem, which is fixed in a following commit -- tiled
rendering does not currently set the viewport at all, which can result
in an empty (or otherwise incorrect viewport), so this assert is definitely
valid.
This reverts commit fb0b42b89af95b42cc6caadf8c22321e5c9386e8.
| -rw-r--r-- | sw/inc/viewsh.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index b40a648afbc1..f839b359ede1 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -571,7 +571,6 @@ 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 c8177a9f1ced..bc043ed7b189 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -469,9 +469,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 - if (!pShell->IsTiledRendering()) - // FIXME is it OK to have no viewport during tiled rendering? - assert(!rViewInformation.getViewport().isEmpty()); + assert(!rViewInformation.getViewport().isEmpty()); if ( !pFlyFrm->IsFlyInCntFrm() ) { // it is also necessary to restore the VCL MapMode from ViewInformation since e.g. |