weld MappingDialog

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

extensions/source/bibliography/bibview.cxx

@@ -187,7 +187,7 @@ namespace bib
 
     IMPL_LINK_NOARG( BibView, CallMappingHdl, void*, void)
     {
-        m_pDatMan->CreateMappingDialog( this );
+        m_pDatMan->CreateMappingDialog(GetFrameWeld());
     }
 
     void BibView::Resize()

extensions/source/bibliography/datman.hxx

@@ -148,7 +148,7 @@ public:
         css::uno::Reference< css::awt::XControlModel > loadControlModel(const OUString& rName,
                                                         bool bForceListBox);
 
-        void                        CreateMappingDialog(vcl::Window* pParent);
+        void                        CreateMappingDialog(weld::Window* pParent);
         OUString                    CreateDBChangeDialog(weld::Window* pParent);
 
         void                        DispatchDBChangeDialog();

extensions/source/bibliography/framectr.cxx

@@ -371,8 +371,8 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
     if ( !bDisposing )
     {
         ::SolarMutexGuard aGuard;
-        VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow( xWindow );
-        WaitObject aWaitObject( pParent );
+        weld::Window* pParent = Application::GetFrameWeld(xWindow);
+        weld::WaitObject aWaitObject(pParent);
 
         OUString aCommand( _rURL.Path);
         if(aCommand == "Bib/Mapping")
@@ -385,7 +385,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         }
         else if(aCommand == "Bib/sdbsource")
         {
-            OUString aURL = m_xDatMan->CreateDBChangeDialog(pParent ? pParent->GetFrameWeld() : nullptr);
+            OUString aURL = m_xDatMan->CreateDBChangeDialog(pParent);
             if(!aURL.isEmpty())
             {
                 try

extensions/source/bibliography/toolbar.cxx

@@ -363,19 +363,20 @@ void BibToolBar::Click()
 {
     sal_uInt16 nId = GetCurItemId();
 
+    vcl::Window* pWin = GetParent();
+
     if (nId == nTBC_BT_COL_ASSIGN )
     {
-        if(pDatMan)
-            pDatMan->CreateMappingDialog(GetParent());
+        if (pDatMan)
+            pDatMan->CreateMappingDialog(pWin ? pWin->GetFrameWeld() : nullptr);
         CheckItem( nId, false );
     }
     else if (nId == nTBC_BT_CHANGESOURCE)
     {
-        if(pDatMan)
+        if (pDatMan)
         {
-            vcl::Window* pWin = GetParent();
             OUString sNew = pDatMan->CreateDBChangeDialog(pWin ? pWin->GetFrameWeld() : nullptr);
-            if(!sNew.isEmpty())
+            if (!sNew.isEmpty())
                 pDatMan->setActiveDataSource(sNew);
         }
         CheckItem( nId, false );