diff options
Diffstat (limited to 'svtools/source/java/javainteractionhandler.cxx')
-rw-r--r-- | svtools/source/java/javainteractionhandler.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 15e797d18dfe..e380fb1972cf 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -122,9 +122,9 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // No suitable JRE found SolarMutexGuard aSolarGuard; m_bJavaNotFound_Handled = true; - MessageDialog aWarningBox(NULL, SvtResId(STR_WARNING_JAVANOTFOUND), VCL_MESSAGE_WARNING); - aWarningBox.SetText(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE)); - nResult = aWarningBox.Execute(); + ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_JAVANOTFOUND), VCL_MESSAGE_WARNING); + aWarningBox->SetText(SvtResId(STR_WARNING_JAVANOTFOUND_TITLE)); + nResult = aWarningBox->Execute(); } else { @@ -139,12 +139,12 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque SolarMutexGuard aSolarGuard; m_bInvalidSettings_Handled = true; #ifdef MACOSX - MessageDialog aWarningBox(NULL, SvtResId(STR_WARNING_INVALIDJAVASETTINGS_MAC), VCL_MESSAGE_WARNING); + ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_INVALIDJAVASETTINGS_MAC), VCL_MESSAGE_WARNING); #else - MessageDialog aWarningBox(NULL, SvtResId(STR_WARNING_INVALIDJAVASETTINGS), VCL_MESSAGE_WARNING); + ScopedVclPtrInstance< MessageDialog > aWarningBox(nullptr, SvtResId(STR_WARNING_INVALIDJAVASETTINGS), VCL_MESSAGE_WARNING); #endif - aWarningBox.SetText(SvtResId(STR_WARNING_INVALIDJAVASETTINGS_TITLE)); - nResult = aWarningBox.Execute(); + aWarningBox->SetText(SvtResId(STR_WARNING_INVALIDJAVASETTINGS_TITLE)); + nResult = aWarningBox->Execute(); } else { @@ -158,9 +158,9 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque SolarMutexGuard aSolarGuard; m_bJavaDisabled_Handled = true; // Java disabled. Give user a chance to enable Java inside Office. - MessageDialog aQueryBox(NULL, "JavaDisabledDialog", - "svt/ui/javadisableddialog.ui"); - nResult = aQueryBox.Execute(); + ScopedVclPtrInstance<MessageDialog> aQueryBox(nullptr , "JavaDisabledDialog", + "svt/ui/javadisableddialog.ui"); + nResult = aQueryBox->Execute(); if ( nResult == RET_YES ) { jfw_setEnabled(sal_True); @@ -182,12 +182,12 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque SolarMutexGuard aSolarGuard; m_bVMCreationFailure_Handled = true; #ifdef MACOSX - MessageDialog aErrorBox(NULL, SvtResId(STR_ERROR_JVMCREATIONFAILED_MAC)); + ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SvtResId(STR_ERROR_JVMCREATIONFAILED_MAC)); #else - MessageDialog aErrorBox(NULL, SvtResId(STR_ERROR_JVMCREATIONFAILED)); + ScopedVclPtrInstance< MessageDialog > aErrorBox(nullptr, SvtResId(STR_ERROR_JVMCREATIONFAILED)); #endif - aErrorBox.SetText(SvtResId(STR_ERROR_JVMCREATIONFAILED_TITLE)); - nResult = aErrorBox.Execute(); + aErrorBox->SetText(SvtResId(STR_ERROR_JVMCREATIONFAILED_TITLE)); + nResult = aErrorBox->Execute(); } else { |