vcl/inc/window.h | 1 - vcl/source/window/stacking.cxx | 10 ---------- vcl/source/window/window.cxx | 1 - 3 files changed, 12 deletions(-)
New commits: commit a2e8e5d2d60884b8ad4e71b82c97d2c14113f6fa Author: Caolán McNamara <caol...@redhat.com> Date: Sat Jan 30 19:01:36 2016 +0000 mnTopLevel is always 1, so 1 <= 1 always here This mnTopLevel has been unused since commit f0f8be40da13833cc518711251fcd990ea91e032 Author: Thomas Arnhold <tho...@arnhold.org> Date: Wed Jul 13 12:57:44 2011 +0200 callcatcher: remove unused SystemWindow::Foo Which removed the unused SystemWindow::SetZLevel which was able to modify mnTopLevel for a window Change-Id: I3eeabfe74a4c56ee6185d66e3949c96009b07bee diff --git a/vcl/inc/window.h b/vcl/inc/window.h index a88a6ad..f61353a 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -109,7 +109,6 @@ struct ImplOverlapData VclPtr<vcl::Window> mpNextBackWin; //< next window with saved background sal_uIntPtr mnSaveBackSize; //< bitmap size of saved background bool mbSaveBack; //< true: save background - sal_uInt8 mnTopLevel; //< Level for Overlap-Window }; struct ImplFrameData diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index cb5f316..6f9ef3a 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -287,16 +287,6 @@ void Window::ImplToTop( ToTopFlags nFlags ) } } - // check TopLevel - sal_uInt8 nTopLevel = mpWindowImpl->mpOverlapData->mnTopLevel; - while ( pNextWin ) - { - if ( (bOnTop != pNextWin->IsAlwaysOnTopEnabled()) || - (nTopLevel <= pNextWin->mpWindowImpl->mpOverlapData->mnTopLevel) ) - break; - pNextWin = pNextWin->mpWindowImpl->mpNext; - } - // add the window to the list again mpWindowImpl->mpNext = pNextWin; if ( pNextWin ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 460d8af..480994f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -939,7 +939,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p mpWindowImpl->mpOverlapData->mpNextBackWin = nullptr; mpWindowImpl->mpOverlapData->mnSaveBackSize = 0; mpWindowImpl->mpOverlapData->mbSaveBack = false; - mpWindowImpl->mpOverlapData->mnTopLevel = 1; } if( pParent && ! mpWindowImpl->mbFrame )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits