diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-06 14:07:17 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-06 12:12:26 +0000 |
| commit | 39078c247d31674544901f8449f5141185f79f7f (patch) | |
| tree | cedf9386e7ddd05996a7755853e6eb2e6adac5fd /toolkit | |
| parent | 7847a338f13071dcd591617f0e8d8fd69b2b0818 (diff) | |
cleanup DIALOG_NO_PARENT, follow on to tdf#91090
remove the DIALOG_NO_PARENT abomination and replace it with a flags
parameter
Change-Id: I71b7dc46c619f2db56af6d4dc2c17daf0a2c8534
Reviewed-on: https://gerrit.libreoffice.org/15645
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/awt/scrollabledialog.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index 08c72bb8c92c..4e552d3e3fc4 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -31,8 +31,8 @@ namespace toolkit // in the same bitmap :-( WB_VSCROLL & WB_HSCROLL apparently are only for // child classes ( whole thing is a mess if you ask me ) template< class T> -ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle ) - : T( pParent, nStyle & ~( WB_AUTOHSCROLL | WB_AUTOVSCROLL ) ), +ScrollableWrapper<T>::ScrollableWrapper( vcl::Window* pParent, WinBits nStyle, Dialog::InitFlag eFlag ) + : T( pParent, nStyle & ~( WB_AUTOHSCROLL | WB_AUTOVSCROLL ), eFlag ), maHScrollBar( VclPtr<ScrollBar>::Create(this, WB_HSCROLL | WB_DRAG) ), maVScrollBar( VclPtr<ScrollBar>::Create(this, WB_VSCROLL | WB_DRAG) ), mbHasHoriBar( false ), diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 05b233013916..9ef383ddf35b 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -917,8 +917,9 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, { // Modal/Modeless nur durch Show/Execute if ( (pParent == NULL ) && ( rDescriptor.ParentIndex == -1 ) ) - pParent = DIALOG_NO_PARENT; - pNewWindow = new toolkit::ScrollableWrapper<Dialog>( pParent, nWinBits ); + pNewWindow = new toolkit::ScrollableWrapper<Dialog>( nullptr, nWinBits, Dialog::InitFlag::NoParent ); + else + pNewWindow = new toolkit::ScrollableWrapper<Dialog>( pParent, nWinBits ); // #i70217# Don't always create a new component object. It's possible that VCL has called // GetComponentInterface( sal_True ) in the Dialog ctor itself (see Window::IsTopWindow() ) // which creates a component object. |