diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-08-24 18:32:38 +0200 |
|---|---|---|
| committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2017-08-25 11:31:42 +0200 |
| commit | db6b703d391838c481fd090065f6d329edcd4efa (patch) | |
| tree | c17b58ca1f9e0f0beaa3b1b5c89d0e85bdaedaf7 /vcl/source/window/msgbox.cxx | |
| parent | 69cfafef7a28aad7a013bb440e15e23e59ea628c (diff) | |
Allow non-modal Dialogs during FileImport/Load
When opening a file that triggers Dialogs (e.g. cannot
read/repair/FileType) the Frame from which it was
initialized gets blocked. This irritates quite some
people. Changed this to a non-modal Dialog so that
the user can continue to work with all opened docs,
open new ones, close and print/PDF/export these.
Change-Id: I048d3de3369527cec20d26396b87439254764b8a
Reviewed-on: https://gerrit.libreoffice.org/41534
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
Diffstat (limited to 'vcl/source/window/msgbox.cxx')
| -rw-r--r-- | vcl/source/window/msgbox.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index e00f2e45bd61..096ad1f57d28 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -122,21 +122,15 @@ void MessBox::ImplInitButtons() } } -MessBox::MessBox( vcl::Window* pParent, MessBoxStyle nMessBoxStyle, - const OUString& rTitle, const OUString& rMessage ) : - MessBox(pParent, nMessBoxStyle, 0, rTitle, rMessage) -{ -} - MessBox::MessBox( vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits nWinBits, - const OUString& rTitle, const OUString& rMessage ) : + const OUString& rTitle, const OUString& rMessage, Dialog::InitFlag eInitFlag) : ButtonDialog( WindowType::MESSBOX ), mbHelpBtn( false ), mbCheck( false ), mnMessBoxStyle( nMessBoxStyle ), maMessText( rMessage ) { - ImplInit( pParent, nWinBits | WB_MOVEABLE | WB_HORZ | WB_CENTER ); + ImplInit( pParent, nWinBits | WB_MOVEABLE | WB_HORZ | WB_CENTER, eInitFlag); ImplInitButtons(); if ( !rTitle.isEmpty() ) @@ -373,7 +367,7 @@ Size MessBox::GetOptimalSize() const } InfoBox::InfoBox( vcl::Window* pParent, const OUString& rMessage ) : - MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, OUString(), rMessage ) + MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, 0, OUString(), rMessage ) { // Default Text is the display title from the application if ( GetText().isEmpty() ) @@ -383,7 +377,7 @@ InfoBox::InfoBox( vcl::Window* pParent, const OUString& rMessage ) : } InfoBox::InfoBox( vcl::Window* pParent, MessBoxStyle nStyle, const OUString& rMessage ) : - MessBox( pParent, nStyle, OUString(), rMessage ) + MessBox( pParent, nStyle, 0, OUString(), rMessage ) { // Default Text is the display title from the application if ( GetText().isEmpty() ) @@ -437,7 +431,7 @@ OUString WarningBox::GetStandardText() } ErrorBox::ErrorBox( vcl::Window* pParent, const OUString& rMessage ) : - MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, OUString(), rMessage ) + MessBox( pParent, MessBoxStyle::Ok | MessBoxStyle::DefaultOk, 0, OUString(), rMessage ) { // Default Text is the display title from the application if ( GetText().isEmpty() ) |