solenv/gbuild/UITest.mk | 1 + svx/source/dialog/charmap.cxx | 3 +++ uitest/uitest/test.py | 3 +++ vcl/source/uitest/uitest.cxx | 4 +++- 4 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit db2ced6c8c42c3fd6bcf77186fdc4c0332928fad Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Dec 19 20:32:28 2016 +0100 uitest: warn if the command is not executed Change-Id: I53bfa5ef7594eeb7446cdb9e4ba211839e255197 diff --git a/vcl/source/uitest/uitest.cxx b/vcl/source/uitest/uitest.cxx index 46457eb..4538388 100644 --- a/vcl/source/uitest/uitest.cxx +++ b/vcl/source/uitest/uitest.cxx @@ -18,10 +18,12 @@ void UITest::executeCommand(const OUString& rCommand) { - comphelper::dispatchCommand( + bool bSuccess = comphelper::dispatchCommand( rCommand, {{"SynchronMode", -1, css::uno::Any(false), css::beans::PropertyState_DIRECT_VALUE}}); + + SAL_WARN_IF(!bSuccess, "uitest", "failed to execute command: " << rCommand); } std::unique_ptr<UIObject> UITest::getFocusTopWindow() commit 49fe525412ce321a6b94091f76e01ec39c3e35f6 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Dec 19 20:30:29 2016 +0100 uitest: help on windows with the debug output Change-Id: Id22412389f3de2c9923887fd99a3e1c6860e1f33 diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index 20f21f8..09cd53f 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -47,6 +47,7 @@ $(call gb_UITest_get_target,%) :| $(gb_UITest_DEPS) $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \ $(DEFS) \ + SAL_LOG_FILE="$(dir $(call gb_UITest_get_target,$*))/soffice.out.log" \ TEST_LIB=$(call gb_Library_get_target,test) \ URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \ PYTHONPATH="$(PYPATH)" \ commit 5a92b4f98ea08a25afadf16f1cebdd0f70c0c548 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Dec 19 20:29:11 2016 +0100 uitest: work around race condition when starting multiple soffice instances Change-Id: I45b57f6789a6156b7f70b39bac624bab55dc17ff diff --git a/uitest/uitest/test.py b/uitest/uitest/test.py index 4090a60..eb01911 100644 --- a/uitest/uitest/test.py +++ b/uitest/uitest/test.py @@ -102,6 +102,9 @@ class UITest(object): time_ = 0 while time_ < 30: if event.executed: + frames = self.get_frames() + self.get_desktop().setActiveFrame(frames[0]) + print(len(frames)) return time_ += DEFAULT_SLEEP time.sleep(DEFAULT_SLEEP) commit 75103ef0141efe3002e42cd92b05fbff806cf6c4 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Mon Dec 19 20:26:27 2016 +0100 make sure the variables are set up Change-Id: Ib710f1ee291fb15ad7b05a5d36824a129d407ccc diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index ff201a6..ff89241 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -577,6 +577,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) if( !aVscrollSB ) return; + if ( !mxFontCharMap.Is() ) + RecalculateFont( *this ); + if( nNewIndex < 0 ) { // need to scroll see closest unicode _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits