remove the fake SvxScriptErrorDialog code

which just forwards to an async real dialog.

Change-Id: I61936c4d105b9829042817e6a3cf5e60c451fb6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95830
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 25 insertions, 49 deletions

diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 3ce12bccf290..ed09844aa771 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -59,12 +59,6 @@ using namespace css::script;
 using namespace css::frame;
 using namespace css::document;
 
-static void ShowErrorDialog( const Any& aException )
-{
-    ScopedVclPtrInstance<SvxScriptErrorDialog> pDlg( aException );
-    pDlg->Execute();
-}
-
 void SvxScriptOrgDialog::delUserData(const weld::TreeIter& rIter)
 {
     SFEntry* pUserData = reinterpret_cast<SFEntry*>(m_xScriptsBox->get_id(rIter).toInt64());
@@ -626,19 +620,19 @@ IMPL_LINK(SvxScriptOrgDialog, ButtonHdl, weld::Button&, rButton, void)
             }
             catch ( reflection::InvocationTargetException& ite )
             {
-                ShowErrorDialog(css::uno::Any(ite));
+                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(ite));
             }
             catch ( provider::ScriptFrameworkErrorException& ite )
             {
-                ShowErrorDialog(css::uno::Any(ite));
+                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(ite));
             }
             catch ( RuntimeException& re )
             {
-                ShowErrorDialog(css::uno::Any(re));
+                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(re));
             }
             catch ( Exception& e )
             {
-                ShowErrorDialog(css::uno::Any(e));
+                SvxScriptErrorDialog::ShowAsyncErrorDialog(getDialog(), css::uno::Any(e));
             }
         }
         StoreCurrentSelection();
@@ -1300,50 +1294,34 @@ OUString GetErrorMessage( const css::uno::Any& aException )
 
 }
 
-SvxScriptErrorDialog::SvxScriptErrorDialog( css::uno::Any const & aException )
-    : m_sMessage()
+// Show Error dialog asynchronously
+void SvxScriptErrorDialog::ShowAsyncErrorDialog( weld::Window* pParent, css::uno::Any const & aException )
 {
     SolarMutexGuard aGuard;
-    m_sMessage = GetErrorMessage( aException );
-}
-
-SvxScriptErrorDialog::~SvxScriptErrorDialog()
-{
-}
-
-short SvxScriptErrorDialog::Execute()
-{
-    // Show Error dialog asynchronously
+    OUString sMessage = GetErrorMessage( aException );
 
     // Pass a copy of the message to the ShowDialog method as the
     // SvxScriptErrorDialog may be deleted before ShowDialog is called
+    DialogData* pData = new DialogData;
+    pData->sMessage = sMessage;
+    pData->pParent = pParent;
     Application::PostUserEvent(
-        LINK( this, SvxScriptErrorDialog, ShowDialog ),
-        new OUString( m_sMessage ) );
-
-    return 0;
+        LINK( nullptr, SvxScriptErrorDialog, ShowDialog ),
+        pData );
 }
 
 IMPL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, p, void )
 {
-    OUString* pMessage = static_cast<OUString*>(p);
-    OUString message;
+    std::unique_ptr<DialogData> xData(static_cast<DialogData*>(p));
+    OUString message = xData->sMessage;
 
-    if ( pMessage && !pMessage->isEmpty() )
-    {
-        message = *pMessage;
-    }
-    else
-    {
+    if ( message.isEmpty() )
         message = CuiResId( RID_SVXSTR_ERROR_TITLE );
-    }
 
-    std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(nullptr,
+    std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(xData->pParent,
                                               VclMessageType::Warning, VclButtonsType::Ok, message));
     xBox->set_title(CuiResId(RID_SVXSTR_ERROR_TITLE));
     xBox->run();
-
-    delete pMessage;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 40102bae726a..5784e4e31fc1 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1123,9 +1123,9 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateActualizeProgressDia
    return VclPtr<CuiAbstractController_Impl>::Create(std::make_unique<ActualizeProgress>(pParent, pThm));
 }
 
-VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateScriptErrorDialog(const css::uno::Any& rException)
+void AbstractDialogFactory_Impl::ShowAsyncScriptErrorDialog(weld::Window* pParent, const css::uno::Any& rException)
 {
-    return VclPtr<SvxScriptErrorDialog>::Create(rException);
+    return SvxScriptErrorDialog::ShowAsyncErrorDialog(pParent, rException);
 }
 
 VclPtr<AbstractScriptSelectorDialog> AbstractDialogFactory_Impl::CreateScriptSelectorDialog(weld::Window* pParent,
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 4f54b03f91d4..89f9ef88a824 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -930,7 +930,7 @@ public:
     virtual VclPtr<AbstractScriptSelectorDialog> CreateScriptSelectorDialog(weld::Window* pParent,
             const css::uno::Reference< css::frame::XFrame >& rxFrame) override;
 
-    virtual VclPtr<VclAbstractDialog> CreateScriptErrorDialog(const css::uno::Any& rException) override;
+    virtual void ShowAsyncScriptErrorDialog(weld::Window* pParent, const css::uno::Any& rException) override;
 
     virtual VclPtr<VclAbstractDialog>  CreateSvxMacroAssignDlg(
                 weld::Window* _pParent,
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index dc2e771b9187..8e66fed69a04 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -150,21 +150,19 @@ public:
     virtual short run() override;
 };
 
-class SvxScriptErrorDialog : public VclAbstractDialog
+class SvxScriptErrorDialog
 {
 private:
-
-    OUString m_sMessage;
+    struct DialogData {
+        weld::Window* pParent;
+        OUString sMessage;
+    };
 
     DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, void );
 
 public:
 
-    SvxScriptErrorDialog( css::uno::Any const & aException );
-
-    virtual ~SvxScriptErrorDialog() override;
-
-    short           Execute() override;
+    static void ShowAsyncErrorDialog( weld::Window* pParent, css::uno::Any const & aException );
 };
 
 #endif // INCLUDED_CUI_SOURCE_INC_SCRIPTDLG_HXX