[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Jan-Marek Glogowski (via logerrit)]

 sfx2/source/sidebar/PanelLayout.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ee8229381a73210856ef2f54f035b70d9c5c7207
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Wed Jul 1 23:26:59 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Jul 2 08:22:03 2020 +0200

    Fix PanelLayout Task::SetPriority warning
    
    SetStyle will tigger a resize event, which in turn will start the
    m_aPanelLayoutIdle, before it's actually prepared, resulting in
    the Task::SetPriority SAL_WARN_IF triggering.
    
    Change-Id: Ide48d6004e242cf75bb48dc9f5e8dc3aa5ff809b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97664
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit fc8cf3afa29909a6c37beaf8021c531ae12773da)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97671
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/sidebar/PanelLayout.cxx b/sfx2/source/sidebar/PanelLayout.cxx
index e4cf889b02ff..6a333819274b 100644
--- a/sfx2/source/sidebar/PanelLayout.cxx
+++ b/sfx2/source/sidebar/PanelLayout.cxx
@@ -21,11 +21,12 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUStrin
     , m_bInClose(false)
     , mxFrame(rFrame)
 {
-    SetStyle(GetStyle() | WB_DIALOGCONTROL);
     m_aPanelLayoutIdle.SetPriority(TaskPriority::RESIZE);
     m_aPanelLayoutIdle.SetInvokeHandler( LINK( this, PanelLayout, ImplHandlePanelLayoutTimerHdl ) );
     m_aPanelLayoutIdle.SetDebugName("sfx2::PanelLayout m_aPanelLayoutIdle");
 
+    SetStyle(GetStyle() | WB_DIALOGCONTROL);
+
     // Builder will trigger resize and start Idle
     m_xVclContentArea = VclPtr<VclVBox>::Create(this);
     m_xVclContentArea->Show();