[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/detailpages.cxx  |    9 +++++----
 dbaccess/source/ui/dlg/detailpages.hxx  |    4 ++--
 dbaccess/uiconfig/ui/autocharsetpage.ui |    2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 199998361c3987f3bcdc26501b5f017d8965a22b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 23 21:30:15 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 24 17:08:45 2018 +0200

    weld OAdoDetailsPage
    
    Change-Id: I81cbac086a00cdaa649c2794a9192dce8e7c5efe
    Reviewed-on: https://gerrit.libreoffice.org/62286
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 869f7aaa197e..01ed8d698457 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -363,15 +363,16 @@ namespace dbaui
     }
 
     // OAdoDetailsPage
-    OAdoDetailsPage::OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
+    OAdoDetailsPage::OAdoDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
+        : DBOCommonBehaviourTabPage(pParent, "dbaccess/ui/autocharsetpage.ui", "AutoCharset",
+                                    rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
     {
 
     }
 
-    VclPtr<SfxTabPage> ODriversSettings::CreateAdo( TabPageParent pParent,   const SfxItemSet* _rAttrSet )
+    VclPtr<SfxTabPage> ODriversSettings::CreateAdo(TabPageParent pParent, const SfxItemSet* rAttrSet)
     {
-        return VclPtr<OAdoDetailsPage>::Create( pParent.pParent, *_rAttrSet );
+        return VclPtr<OAdoDetailsPage>::Create(pParent, *rAttrSet);
     }
 
     // OOdbcDetailsPage
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index e15a33ef08f8..767e6669963b 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -154,10 +154,10 @@ namespace dbaui
     };
 
     // OAdoDetailsPage
-    class OAdoDetailsPage : public OCommonBehaviourTabPage
+    class OAdoDetailsPage : public DBOCommonBehaviourTabPage
     {
     public:
-        OAdoDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
+        OAdoDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
     };
 
     // OOdbcDetailsPage
diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui b/dbaccess/uiconfig/ui/autocharsetpage.ui
index 927269fc7e76..114bcf72efe5 100644
--- a/dbaccess/uiconfig/ui/autocharsetpage.ui
+++ b/dbaccess/uiconfig/ui/autocharsetpage.ui
@@ -46,7 +46,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="dbulo-CharSetListBox" id="charset">
+                  <object class="GtkComboBoxText" id="charset">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>