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

[Libreoffice Gerrit user]

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

New commits:
commit ea5c47d8ab9c8da6facc6ab950a93f4b0c286cb5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 24 09:24:45 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 24 17:12:23 2018 +0200

    weld OMySQLODBCDetailsPage
    
    Change-Id: I8f0c291a9bfc3c9cc5edb6095fd31aba68a6feac
    Reviewed-on: https://gerrit.libreoffice.org/62290
    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 c571aae44ae7..e7906b62c69b 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -483,14 +483,15 @@ namespace dbaui
         DBOCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
     }
     // OMySQLODBCDetailsPage
-    OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs )
-        :OCommonBehaviourTabPage(pParent, "AutoCharset", "dbaccess/ui/autocharsetpage.ui", _rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
+    OMySQLODBCDetailsPage::OMySQLODBCDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
+        : DBOCommonBehaviourTabPage(pParent, "dbaccess/ui/autocharsetpage.ui", "AutoCharset",
+                                    rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
     {
     }
 
-    VclPtr<SfxTabPage> ODriversSettings::CreateMySQLODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
+    VclPtr<SfxTabPage> ODriversSettings::CreateMySQLODBC(TabPageParent pParent, const SfxItemSet* pAttrSet)
     {
-        return VclPtr<OMySQLODBCDetailsPage>::Create( pParent.pParent, *_rAttrSet );
+        return VclPtr<OMySQLODBCDetailsPage>::Create(pParent, *pAttrSet);
     }
 
     // OMySQLJDBCDetailsPage
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index d59e2ff065ce..7ce9cfa75c1f 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -195,10 +195,10 @@ namespace dbaui
     };
 
     // OMySQLODBCDetailsPage
-    class OMySQLODBCDetailsPage : public OCommonBehaviourTabPage
+    class OMySQLODBCDetailsPage : public DBOCommonBehaviourTabPage
     {
     public:
-        OMySQLODBCDetailsPage( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs );
+        OMySQLODBCDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
     };
 
     // OGeneralSpecialJDBCDetailsPage