commit 199998361c3987f3bcdc26501b5f017d8965a22b
author Caolán McNamara <caolanm@redhat.com> Tue Oct 23 21:30:15 2018 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Oct 24 17:08:45 2018 +0200
tree 4dcb5efb5b4ee7da64da501fc6d7e37180c6507f
parent 33b76785eeff2a261a0a35a4041180d175e3f8e4

weld OAdoDetailsPage

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

dbaccess/source/ui/dlg/detailpages.cxx

diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 869f7aa..01ed8d6 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

dbaccess/source/ui/dlg/detailpages.hxx

diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index e15a33e..767e666 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

dbaccess/uiconfig/ui/autocharsetpage.ui

diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui b/dbaccess/uiconfig/ui/autocharsetpage.ui
index 927269f..114bcf7 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>