[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/source

[Caolán McNamara]

 vcl/source/window/taskpanelist.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 436e616fead1c372827fd18fe388cfa6cf4049a3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 12 17:08:28 2016 +0100

    Resolves: tdf#101879 explicitly put menubars at the start of task lists
    
    Change-Id: Ia6a36b08f84960b01472833504cd65bfbad473eb
    (cherry picked from commit 830ac71eca425caf04764076e3064b5f1ad05c52)
    Reviewed-on: https://gerrit.libreoffice.org/28878
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index 4e995a5..21b94d2 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -96,7 +96,7 @@ void TaskPaneList::AddWindow( vcl::Window *pWindow )
 {
     if( pWindow )
     {
-        auto insertionPos = mTaskPanes.end();
+        auto insertionPos = dynamic_cast<MenuBarWindow*>(pWindow) ? mTaskPanes.begin() : mTaskPanes.end();
         for ( auto p = mTaskPanes.begin(); p != mTaskPanes.end(); ++p )
         {
             if ( *p == pWindow )