weld FormulaDialog

drop xFocusWin hack, I don't see what gain it gives

Change-Id: I31952b5440797e6209ed1de6b546f1e4c0238d08
Reviewed-on: https://gerrit.libreoffice.org/71675
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 9 insertions, 18 deletions

diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index a1597d63502f..9a2b11e8633c 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -44,7 +44,7 @@ namespace rptui
 //      initialization / shared functions for the dialog
 
 
-FormulaDialog::FormulaDialog(vcl::Window* pParent
+FormulaDialog::FormulaDialog(weld::Window* pParent
                              , const uno::Reference<lang::XMultiServiceFactory>& _xServiceFactory
                              , const std::shared_ptr< IFunctionManager >&  _pFunctionMgr
                              , const OUString& _sFormula
@@ -88,11 +88,6 @@ void FormulaDialog::fill()
 
 FormulaDialog::~FormulaDialog()
 {
-    disposeOnce();
-}
-
-void FormulaDialog::dispose()
-{
     if ( m_pAddField )
     {
         SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN );
@@ -102,10 +97,8 @@ void FormulaDialog::dispose()
     StoreFormEditData( m_pFormulaData );
     m_pEdit.clear();
     m_pAddField.clear();
-    formula::FormulaModalDialog::dispose();
 }
 
-
 // functions for right side
 
 bool FormulaDialog::calculateValue( const OUString& rStrExp, OUString& rStrResult, bool /*bMatrixFormula*/ )
@@ -126,8 +119,9 @@ std::unique_ptr<formula::FormulaCompiler> FormulaDialog::createCompiler( formula
 
 void FormulaDialog::doClose(bool _bOk)
 {
-    EndDialog(_bOk ? RET_OK : RET_CANCEL);
+    response(_bOk ? RET_OK : RET_CANCEL);
 }
+
 void FormulaDialog::insertEntryToLRUList(const IFunctionDescription*    /*_pDesc*/)
 {
 }
@@ -217,7 +211,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
 
     if ( !m_pAddField )
     {
-        m_pAddField = VclPtr<OAddFieldWindow>::Create(this,m_xRowSet);
+        m_pAddField = VclPtr<OAddFieldWindow>::Create(nullptr, m_xRowSet);
         m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) );
         SvtViewOptions aDlgOpt( EViewType::Window, HID_RPT_FIELD_SEL_WIN );
         if ( aDlgOpt.Exists() )
@@ -230,7 +224,6 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
     }
     RefInputStartAfter();
     m_pAddField->Show();
-
 }
 
 void FormulaDialog::ToggleCollapsed( WeldRefEdit* /*_pEdit*/, WeldRefButton* /*_pButton*/)
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index e28438325329..569332e17d40 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -60,7 +60,7 @@ class FormulaDialog : public formula::FormulaModalDialog,
 
     DECL_LINK( OnClickHdl, OAddFieldWindow&, void );
 public:
-    FormulaDialog( vcl::Window* pParent
+    FormulaDialog( weld::Window* pParent
         , const css::uno::Reference< css::lang::XMultiServiceFactory>& _xServiceFactory
         , const std::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
         , const OUString& _sFormula
@@ -68,7 +68,6 @@ public:
         , svl::SharedStringPool& rStrPool );
 
     virtual ~FormulaDialog() override;
-    virtual void dispose() override;
 
     // IFormulaEditorHelper
     virtual void notifyChange() override;
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 51e847c74135..395cb6c32452 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -1009,7 +1009,6 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
     {
         xFactory = _xContext->getServiceManager();
         xServiceFactory.set(xFactory,uno::UNO_QUERY);
-        VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( _xInspectorWindow );
 
         uno::Reference< report::meta::XFunctionManager> xMgr(xFactory->createInstanceWithContext("org.libreoffice.report.pentaho.SOFunctionManager",_xContext),uno::UNO_QUERY);
         if ( xMgr.is() )
@@ -1021,14 +1020,14 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
             CharClass aCC(_xContext, aLangTag);
             svl::SharedStringPool aStringPool(aCC);
 
-            ScopedVclPtrInstance<FormulaDialog> aDlg(
-                pParent, xServiceFactory, pFormulaManager,
+            FormulaDialog aDlg(
+                Application::GetFrameWeld(_xInspectorWindow), xServiceFactory, pFormulaManager,
                 aFormula.getUndecoratedContent(), _xRowSet, aStringPool);
 
-            bSuccess = aDlg->Execute() == RET_OK;
+            bSuccess = aDlg.run() == RET_OK;
             if ( bSuccess )
             {
-                OUString sFormula = aDlg->getCurrentFormula();
+                OUString sFormula = aDlg.getCurrentFormula();
                 if ( sFormula[0] == '=' )
                     _in_out_rFormula = "rpt:" + sFormula.copy(1);
                 else