[Libreoffice-commits] core.git: 2 commits - solenv/gbuild vcl/inc vcl/source

[Caolán McNamara]

 solenv/gbuild/platform/unittest-failed-WNT.sh |    4 ++++
 vcl/inc/helpwin.hxx                           |    1 -
 vcl/source/app/help.cxx                       |   12 +-----------
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 660b12e47d3aedb8fcf2ed2c50f8175d351a51aa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 18 12:43:43 2017 +0100

    tdf#112830 measure test with ApplySettings applied
    
    and don't invalidate on first view
    
    Change-Id: I1156c83c0365ef27946cc414cad8dfa07206e5af
    Reviewed-on: https://gerrit.libreoffice.org/43498
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index c2d068c1c79e..09fed59b7138 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -47,7 +47,6 @@ private:
     virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
     virtual void RequestHelp( const HelpEvent& rHEvt ) override;
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
-    virtual void StateChanged(StateChangedType nType) override;
 
     virtual OUString GetText() const override;
     void ImplShow();
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index e2410e596b62..a1d909eb6eed 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -281,17 +281,6 @@ HelpTextWindow::HelpTextWindow( vcl::Window* pParent, const OUString& rText, sal
     maHideTimer.SetDebugName( "vcl::HelpTextWindow maHideTimer" );
 }
 
-void HelpTextWindow::StateChanged(StateChangedType nType)
-{
-    FloatingWindow::StateChanged(nType);
-    if (nType == StateChangedType::InitShow)
-    {
-        ApplySettings(*this);
-        SetHelpText(maHelpText);
-        Invalidate();
-    }
-}
-
 void HelpTextWindow::ApplySettings(vcl::RenderContext& rRenderContext)
 {
     const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
@@ -334,6 +323,7 @@ void HelpTextWindow::dispose()
 void HelpTextWindow::SetHelpText( const OUString& rHelpText )
 {
     maHelpText = rHelpText;
+    ApplySettings(*this);
     if ( mnHelpWinStyle == HELPWINSTYLE_QUICK && maHelpText.getLength() < HELPTEXTMAXLEN)
     {
         Size aSize;
commit 516efc23377452f4a3950289a3977a7bb68ba188
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Wed Oct 18 19:33:37 2017 +0200

    Let's have this additional info also for WIN builds
    
    Change-Id: Ie641f7005980585501f2de1ed83f1cd27549b2bb
    Reviewed-on: https://gerrit.libreoffice.org/43536
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/solenv/gbuild/platform/unittest-failed-WNT.sh b/solenv/gbuild/platform/unittest-failed-WNT.sh
index 55b583d1108d..d5df28ce186c 100755
--- a/solenv/gbuild/platform/unittest-failed-WNT.sh
+++ b/solenv/gbuild/platform/unittest-failed-WNT.sh
@@ -23,6 +23,10 @@ make $1Test_$2 CPPUNITTRACE=TRUE # which is a shortcut for the following line
 make $1Test_$2 CPPUNITTRACE="'$DEVENV' /debugexe" # for interactive debugging in Visual Studio
 make $1Test_$2 CPPUNITTRACE="drmemory -free_max_frames 20" # for memory checking (install Dr.Memory first, and put it to your PATH)
 
+You can limit the execution to just one particular test by:
+
+make $1Test_$2 CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params...
+
 EOF
 
 exit 1