weld SwCreateAuthEntryDlg_Impl

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

2 files changed, 67 insertions, 30 deletions

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index dd831b6d3a8f..159fd97a4d2e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -296,6 +296,26 @@ public:
         return m_xWidget->get_grid_top_attach();
     }
 
+    virtual void set_hexpand(bool bExpand) override
+    {
+        m_xWidget->set_hexpand(bExpand);
+    }
+
+    virtual bool get_hexpand() const override
+    {
+        return m_xWidget->get_hexpand();
+    }
+
+    virtual void set_vexpand(bool bExpand) override
+    {
+        m_xWidget->set_vexpand(bExpand);
+    }
+
+    virtual bool get_vexpand() const override
+    {
+        return m_xWidget->get_vexpand();
+    }
+
     virtual void set_margin_top(int nMargin) override
     {
         m_xWidget->set_margin_top(nMargin);
@@ -422,17 +442,13 @@ public:
         , m_xContainer(pContainer)
     {
     }
-    virtual void remove(weld::Widget* pWidget) override
-    {
-        SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pWidget);
-        assert(pVclWidget);
-        pVclWidget->getWidget()->SetParent(nullptr);
-    }
-    virtual void add(weld::Widget* pWidget) override
+    virtual void move(weld::Widget* pWidget, weld::Container* pNewParent) override
     {
         SalInstanceWidget* pVclWidget = dynamic_cast<SalInstanceWidget*>(pWidget);
         assert(pVclWidget);
-        pVclWidget->getWidget()->SetParent(m_xContainer);
+        SalInstanceContainer* pNewVclParent = dynamic_cast<SalInstanceContainer*>(pNewParent);
+        assert(pNewVclParent);
+        pVclWidget->getWidget()->SetParent(pNewVclParent->getWidget());
     }
 };
 
@@ -1129,8 +1145,6 @@ public:
         m_xTreeView->SetEntryData(nInsertedAt, new OUString(rId));
     }
 
-    using SalInstanceContainer::remove;
-
     virtual void remove(int pos) override
     {
         m_xTreeView->RemoveEntry(pos);
@@ -1374,6 +1388,12 @@ public:
     {
         return m_xLabel->GetText();
     }
+
+    virtual void set_mnemonic_widget(Widget* pTarget) override
+    {
+        SalInstanceWidget* pTargetWidget = dynamic_cast<SalInstanceWidget*>(pTarget);
+        m_xLabel->set_mnemonic_widget(pTargetWidget ? pTargetWidget->getWidget() : nullptr);
+    }
 };
 
 class SalInstanceTextView : public SalInstanceContainer, public virtual weld::TextView
@@ -1695,8 +1715,6 @@ public:
         return m_xComboBoxText->GetSelectedEntry();
     }
 
-    using SalInstanceContainer::remove;
-
     virtual void remove(int pos) override
     {
         m_xComboBoxText->RemoveEntry(pos);
@@ -1765,8 +1783,6 @@ public:
         return m_xComboBoxText->GetText();
     }
 
-    using SalInstanceContainer::remove;
-
     virtual void remove(int pos) override
     {
         m_xComboBoxText->RemoveEntryAt(pos);
@@ -2054,8 +2070,7 @@ namespace weld
             m_xOrigParent.reset(m_xRelocate->weld_parent());
             //fdo#75121, a bit tricky because the widgets we want to align with
             //don't actually exist in the ui description, they're implied
-            m_xOrigParent->remove(m_xRelocate.get());
-            m_xContentArea->add(m_xRelocate.get());
+            m_xOrigParent->move(m_xRelocate.get(), m_xContentArea.get());
         }
     }
 
@@ -2063,8 +2078,7 @@ namespace weld
     {
         if (m_xRelocate)
         {
-            m_xContentArea->remove(m_xRelocate.get());
-            m_xOrigParent->add(m_xRelocate.get());
+            m_xContentArea->move(m_xRelocate.get(), m_xOrigParent.get());
         }
     }
 }
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 4c273766bde0..14e8af024d01 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1319,6 +1319,26 @@ public:
         return nAttach;
     }
 
+    virtual void set_hexpand(bool bExpand) override
+    {
+        gtk_widget_set_hexpand(m_pWidget, bExpand);
+    }
+
+    virtual bool get_hexpand() const override
+    {
+        return gtk_widget_get_hexpand(m_pWidget);
+    }
+
+    virtual void set_vexpand(bool bExpand) override
+    {
+        gtk_widget_set_vexpand(m_pWidget, bExpand);
+    }
+
+    virtual bool get_vexpand() const override
+    {
+        return gtk_widget_get_vexpand(m_pWidget);
+    }
+
     virtual void set_margin_top(int nMargin) override
     {
         gtk_widget_set_margin_top(m_pWidget, nMargin);
@@ -1621,18 +1641,19 @@ public:
     {
     }
 
-    virtual void remove(weld::Widget* pWidget) override
-    {
-        GtkInstanceWidget* pGtkWidget = dynamic_cast<GtkInstanceWidget*>(pWidget);
-        assert(pGtkWidget);
-        gtk_container_remove(m_pContainer, pGtkWidget->getWidget());
-    }
+    GtkContainer* getContainer() { return m_pContainer; }
 
-    virtual void add(weld::Widget* pWidget) override
+    virtual void move(weld::Widget* pWidget, weld::Container* pNewParent) override
     {
         GtkInstanceWidget* pGtkWidget = dynamic_cast<GtkInstanceWidget*>(pWidget);
         assert(pGtkWidget);
-        gtk_container_add(m_pContainer, pGtkWidget->getWidget());
+        GtkInstanceContainer* pNewGtkParent = dynamic_cast<GtkInstanceContainer*>(pNewParent);
+        assert(pNewGtkParent);
+        GtkWidget* pChild = pGtkWidget->getWidget();
+        g_object_ref(pChild);
+        gtk_container_remove(getContainer(), pChild);
+        gtk_container_add(pNewGtkParent->getContainer(), pChild);
+        g_object_unref(pChild);
     }
 };
 
@@ -2917,8 +2938,6 @@ public:
         enable_notify_events();
     }
 
-    using GtkInstanceContainer::remove;
-
     virtual void remove(int pos) override
     {
         disable_notify_events();
@@ -3268,6 +3287,12 @@ public:
     {
         return ::get_label(m_pLabel);
     }
+
+    virtual void set_mnemonic_widget(Widget* pTarget) override
+    {
+        GtkInstanceWidget* pTargetWidget = dynamic_cast<GtkInstanceWidget*>(pTarget);
+        gtk_label_set_mnemonic_widget(m_pLabel, pTargetWidget ? pTargetWidget->getWidget() : nullptr);
+    }
 };
 
 class GtkInstanceTextView : public GtkInstanceContainer, public virtual weld::TextView
@@ -3801,8 +3826,6 @@ public:
         enable_notify_events();
     }
 
-    using GtkInstanceContainer::remove;
-
     virtual void remove(int pos) override
     {
         disable_notify_events();