diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-19 15:17:14 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-10-19 19:06:16 +0200 |
| commit | b86b78e0ad9bb1e6ed2e22a0fca18cad8d19ded1 (patch) | |
| tree | 7b6af5c892ee6b87d5c73df148cfc2d2d20dc283 /sfx2 | |
| parent | e91a1abe4c53ea3a1ac59e3c1d5dddf98141a4ee (diff) | |
Revert "CppunitTest_desktop_lib: add ModifiedStatus callback testcase"
This reverts commit cdf08b3aa74bb32ea18b583a9c0c41b91d7819ac. It breaks
'make -sr CppunitTest_desktop_lib
CPPUNIT_TEST_NAME="DesktopLOKTest::testPaintPartTile
DesktopLOKTest::testWriterCommentInsertCursor" VALGRIND=memcheck' (it is
terminated by SIGSEGV), and also it's the reason why sometimes the
lo_ubsan buildbot fails, see e.g.
<http://ci.libreoffice.org/job/lo_ubsan/329/console>.
This has to be re-introduced once I find a way to process all binding
updates at once without side-effects.
Conflicts:
desktop/qa/desktop_lib/test_desktop_lib.cxx
sfx2/source/control/bindings.cxx
Change-Id: Id6c49b9b31095ef1a1a8c1cd92cbae5deb316500
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 04d625a50b59..4562cc1d8063 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1470,9 +1470,7 @@ bool SfxBindings::NextJob_Impl(Timer * pTimer) } // if possible Update all server / happens in its own time slice - // but process all events at once when unit testing, for reliability reasons - static bool bTest = getenv("LO_TESTNAME"); - if ( pImpl->bMsgDirty && !bTest ) + if ( pImpl->bMsgDirty ) { UpdateSlotServer_Impl(); return false; |