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 /basic | |
| 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 'basic')
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 6 | ||||
| -rw-r--r-- | basic/source/runtime/methods.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 73899c44a5cc..ee131487bd5a 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -722,9 +722,9 @@ void SbiIoSystem::Shutdown() { #if defined __GNUC__ vcl::Window* pParent = Application::GetDefDialogParent(); - ScopedVclPtrInstance<MessBox>( pParent, MessBoxStyle::Ok, OUString(), aOut )->Execute(); + ScopedVclPtrInstance<MessBox>( pParent, MessBoxStyle::Ok, 0, OUString(), aOut )->Execute(); #else - ScopedVclPtrInstance<MessBox>( Application::GetDefDialogParent(), MessBoxStyle::Ok, OUString(), aOut )->Execute(); + ScopedVclPtrInstance<MessBox>( Application::GetDefDialogParent(), MessBoxStyle::Ok, 0, OUString(), aOut )->Execute(); #endif } aOut.clear(); @@ -870,7 +870,7 @@ void SbiIoSystem::WriteCon(const OUString& rText) if( !ScopedVclPtrInstance<MessBox>( Application::GetDefDialogParent(), MessBoxStyle::OkCancel | MessBoxStyle::DefaultOk, - OUString(), s)->Execute() ) + 0, OUString(), s)->Execute() ) { nError = ERRCODE_BASIC_USER_ABORT; } diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 26fcf6bb2161..680b65a6f817 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4345,7 +4345,7 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) pBox.reset(VclPtr<InfoBox>::Create( pParent, nWinBits, aMsg )); break; default: - pBox.reset(VclPtr<MessBox>::Create( pParent, nWinBits, aTitle, aMsg )); + pBox.reset(VclPtr<MessBox>::Create( pParent, nWinBits, 0, aTitle, aMsg )); } pBox->SetText( aTitle ); short nRet = pBox->Execute(); |