From dcc667ac5ef0d7b4bbdfba0727ef6e2be3ed5313 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 22 Aug 2017 11:11:44 +0200 Subject: convert message box style bits to scoped enum and fix harmless bug in ImpSVGDialog::ImpSVGDialog, which there since commit 6456f1d81090dd5fe44455c09ae3ede7ec6ac38a Date: Fri Feb 4 14:52:54 2011 +0100 ka102: added/removed files for SVG import and module cleanup Change-Id: I66b2ec2b029431ab453e54e962863e4ed7d78962 Reviewed-on: https://gerrit.libreoffice.org/41412 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/source/ui/docshell/docsh.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sc/source/ui/docshell/docsh.cxx') diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f51db7d69225..2e26e5d2386e 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -472,7 +472,7 @@ bool ScDocShell::LoadXML( SfxMedium* pLoadMedium, const css::uno::Reference< css // Generator is not LibreOffice. Ask if the user wants to perform // full re-calculation. ScopedVclPtrInstance aBox( - GetActiveDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), + GetActiveDialogParent(), MessBoxStyle::YesNo | MessBoxStyle::DefaultYes, ScGlobal::GetRscString(STR_QUERY_FORMULA_RECALC_ONLOAD_ODS)); aBox->SetCheckBoxText(ScGlobal::GetRscString(STR_ALWAYS_PERFORM_SELECTED)); @@ -706,7 +706,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) ScAppOptions aAppOptions = SC_MOD()->GetAppOptions(); if ( aAppOptions.GetShowSharedDocumentWarning() ) { - ScopedVclPtrInstance aBox( GetActiveDialogParent(), WinBits( WB_OK ), + ScopedVclPtrInstance aBox( GetActiveDialogParent(), MessBoxStyle::Ok, ScGlobal::GetRscString( STR_SHARED_DOC_WARNING ) ); aBox->SetDefaultCheckBoxText(); aBox->Execute(); @@ -833,7 +833,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) OUString aMessage( ScGlobal::GetRscString( STR_FILE_LOCKED_SAVE_LATER ) ); aMessage = aMessage.replaceFirst( "%1", aUserName ); - ScopedVclPtrInstance< WarningBox > aBox( GetActiveDialogParent(), WinBits( WB_RETRY_CANCEL | WB_DEF_RETRY ), aMessage ); + ScopedVclPtrInstance< WarningBox > aBox( GetActiveDialogParent(), MessBoxStyle::RetryCancel | MessBoxStyle::DefaultRetry, aMessage ); if ( aBox->Execute() == RET_RETRY ) { bRetry = true; @@ -908,7 +908,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) } else { - ScopedVclPtrInstance aBox( GetActiveDialogParent(), WinBits( WB_OK ), + ScopedVclPtrInstance aBox( GetActiveDialogParent(), MessBoxStyle::Ok, ScGlobal::GetRscString( STR_DOC_NOLONGERSHARED ) ); aBox->Execute(); @@ -949,7 +949,7 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( GetDocument().GetExternalRefManager()->containsUnsavedReferences() ) { - ScopedVclPtrInstance aBox( GetActiveDialogParent(), WinBits( WB_YES_NO ), + ScopedVclPtrInstance aBox( GetActiveDialogParent(), MessBoxStyle::YesNo, ScGlobal::GetRscString( STR_UNSAVED_EXT_REF ) ); if( RET_NO == aBox->Execute()) -- cgit