1 files changed, 204 insertions, 74 deletions

diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 9c8d0fdd8e91..2a3824bec6a4 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -39,6 +39,9 @@
 #include "TextConnectionHelper.hxx"
 #include <osl/diagnose.h>
 
+#include <IItemSetHelper.hxx>
+#include <comphelper/string.hxx>
+
 namespace dbaui
 {
 using namespace ::com::sun::star;
@@ -50,9 +53,9 @@ using namespace ::com::sun::star;
 
     // OTextConnectionPageSetup
     OTextConnectionPageSetup::OTextConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
-        : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/dbwiztextpage.ui", "DBWizTextPage",
+        : OConnectionTabPageSetup(pPage, pController, u"dbaccess/ui/dbwiztextpage.ui"_ustr, u"DBWizTextPage"_ustr,
                                   rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
-        , m_xSubContainer(m_xBuilder->weld_widget("TextPageContainer"))
+        , m_xSubContainer(m_xBuilder->weld_widget(u"TextPageContainer"_ustr))
         , m_xTextConnectionHelper(new OTextConnectionHelper(m_xSubContainer.get(), TC_EXTENSION | TC_SEPARATORS))
     {
         m_xTextConnectionHelper->SetClickHandler(LINK( this, OTextConnectionPageSetup, ImplGetExtensionHdl ) );
@@ -116,16 +119,16 @@ using namespace ::com::sun::star;
 
     // OLDAPPageSetup
     OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs )
-        : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/ldapconnectionpage.ui", "LDAPConnectionPage", _rCoreAttrs)
-        , m_xFTHelpText(m_xBuilder->weld_label("helpLabel"))
-        , m_xFTHostServer(m_xBuilder->weld_label("hostNameLabel"))
-        , m_xETHostServer(m_xBuilder->weld_entry("hostNameEntry"))
-        , m_xFTBaseDN(m_xBuilder->weld_label("baseDNLabel"))
-        , m_xETBaseDN(m_xBuilder->weld_entry("baseDNEntry"))
-        , m_xFTPortNumber(m_xBuilder->weld_label("portNumLabel"))
-        , m_xNFPortNumber(m_xBuilder->weld_spin_button("portNumEntry"))
-        , m_xFTDefaultPortNumber(m_xBuilder->weld_label("portNumDefLabel"))
-        , m_xCBUseSSL(m_xBuilder->weld_check_button("useSSLCheckbutton"))
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/ldapconnectionpage.ui"_ustr, u"LDAPConnectionPage"_ustr, _rCoreAttrs)
+        , m_xFTHelpText(m_xBuilder->weld_label(u"helpLabel"_ustr))
+        , m_xFTHostServer(m_xBuilder->weld_label(u"hostNameLabel"_ustr))
+        , m_xETHostServer(m_xBuilder->weld_entry(u"hostNameEntry"_ustr))
+        , m_xFTBaseDN(m_xBuilder->weld_label(u"baseDNLabel"_ustr))
+        , m_xETBaseDN(m_xBuilder->weld_entry(u"baseDNEntry"_ustr))
+        , m_xFTPortNumber(m_xBuilder->weld_label(u"portNumLabel"_ustr))
+        , m_xNFPortNumber(m_xBuilder->weld_spin_button(u"portNumEntry"_ustr))
+        , m_xFTDefaultPortNumber(m_xBuilder->weld_label(u"portNumDefLabel"_ustr))
+        , m_xCBUseSSL(m_xBuilder->weld_check_button(u"useSSLCheckbutton"_ustr))
     {
         m_xETHostServer->connect_changed(LINK(this, OGenericAdministrationPage, OnControlEntryModifyHdl));
         m_xETBaseDN->connect_changed(LINK(this, OGenericAdministrationPage, OnControlEntryModifyHdl));
@@ -153,7 +156,7 @@ using namespace ::com::sun::star;
             OSL_ENSURE(pCollection, "OLDAPConnectionPageSetup::FillItemSet : really need a DSN type collection !");
             if (pCollection)
             {
-                OUString sUrl = pCollection->getPrefix( "sdbc:address:ldap:") + m_xETHostServer->get_text();
+                OUString sUrl = pCollection->getPrefix( u"sdbc:address:ldap:") + m_xETHostServer->get_text();
                 _rSet->Put(SfxStringItem(DSID_CONNECTURL, sUrl));
                 bChangedSomething = true;
             }
@@ -167,7 +170,7 @@ using namespace ::com::sun::star;
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETHostServer.get()));
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETBaseDN.get()));
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::SpinButton>(m_xNFPortNumber.get()));
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBUseSSL.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBUseSSL.get()));
     }
     void OLDAPConnectionPageSetup::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
     {
@@ -208,10 +211,10 @@ using namespace ::com::sun::star;
     }
 
     OMySQLIntroPageSetup::OMySQLIntroPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rCoreAttrs)
-        : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/dbwizmysqlintropage.ui", "DBWizMysqlIntroPage", _rCoreAttrs)
-        , m_xODBCDatabase(m_xBuilder->weld_radio_button("odbc"))
-        , m_xJDBCDatabase(m_xBuilder->weld_radio_button("jdbc"))
-        , m_xNATIVEDatabase(m_xBuilder->weld_radio_button("directly"))
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/dbwizmysqlintropage.ui"_ustr, u"DBWizMysqlIntroPage"_ustr, _rCoreAttrs)
+        , m_xODBCDatabase(m_xBuilder->weld_radio_button(u"odbc"_ustr))
+        , m_xJDBCDatabase(m_xBuilder->weld_radio_button(u"jdbc"_ustr))
+        , m_xNATIVEDatabase(m_xBuilder->weld_radio_button(u"directly"_ustr))
     {
         m_xODBCDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected));
         m_xJDBCDatabase->connect_toggled(LINK(this, OMySQLIntroPageSetup, OnSetupModeSelected));
@@ -223,7 +226,7 @@ using namespace ::com::sun::star;
     {
     }
 
-    IMPL_LINK_NOARG(OMySQLIntroPageSetup, OnSetupModeSelected, weld::ToggleButton&, void)
+    IMPL_LINK_NOARG(OMySQLIntroPageSetup, OnSetupModeSelected, weld::Toggleable&, void)
     {
         maClickHdl.Call( this );
     }
@@ -232,13 +235,17 @@ using namespace ::com::sun::star;
     {
         // show the "Connect directly" option only if the driver is installed
         const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rSet.GetItem(DSID_TYPECOLLECTION) );
-        bool bHasMySQLNative = ( pCollectionItem != nullptr ) && pCollectionItem->getCollection()->hasDriver( "sdbc:mysql:mysqlc:" );
+        bool bHasMySQLNative = ( pCollectionItem != nullptr ) && pCollectionItem->getCollection()->hasDriver( u"sdbc:mysql:mysqlc:" );
         if ( bHasMySQLNative )
             m_xNATIVEDatabase->show();
 
-        // if any of the options is checked, then there's nothing to do
+        // tdf#103068: if any of the options is checked, then just update the selected kind:
+        // it could happen that the selection and the wizard path are not in sync
         if ( m_xODBCDatabase->get_active() || m_xJDBCDatabase->get_active() || m_xNATIVEDatabase->get_active() )
+        {
+            maClickHdl.Call(this);
             return;
+        }
 
         // prefer "native" or "JDBC"
         if ( bHasMySQLNative )
@@ -273,9 +280,9 @@ using namespace ::com::sun::star;
 
     // MySQLNativeSetupPage
     MySQLNativeSetupPage::MySQLNativeSetupPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs )
-        : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/dbwizmysqlnativepage.ui", "DBWizMysqlNativePage", rCoreAttrs)
-        , m_xHelpText(m_xBuilder->weld_label("helptext"))
-        , m_xSettingsContainer(m_xBuilder->weld_container("MySQLSettingsContainer"))
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/dbwizmysqlnativepage.ui"_ustr, u"DBWizMysqlNativePage"_ustr, rCoreAttrs)
+        , m_xHelpText(m_xBuilder->weld_label(u"helptext"_ustr))
+        , m_xSettingsContainer(m_xBuilder->weld_container(u"MySQLSettingsContainer"_ustr))
         , m_xMySQLSettings(new MySQLNativeSettings(m_xSettingsContainer.get(), LINK(this, OGenericAdministrationPage, OnControlModified)))
     {
         SetRoadmapStateValue(false);
@@ -324,21 +331,21 @@ using namespace ::com::sun::star;
     }
 
     // OMySQLJDBCConnectionPageSetup
-    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, const char* pDefaultPortResId, const char* pHelpTextResId, const char* pHeaderTextResId, const char* pDriverClassId)
-        : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/specialjdbcconnectionpage.ui", "SpecialJDBCConnectionPage", _rCoreAttrs)
+    OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, TranslateId pDefaultPortResId, TranslateId pHelpTextResId, TranslateId pHeaderTextResId, TranslateId pDriverClassId)
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/specialjdbcconnectionpage.ui"_ustr, u"SpecialJDBCConnectionPage"_ustr, _rCoreAttrs)
         , m_nPortId(_nPortId)
-        , m_xHeaderText(m_xBuilder->weld_label("header"))
-        , m_xFTHelpText(m_xBuilder->weld_label("helpLabel"))
-        , m_xFTDatabasename(m_xBuilder->weld_label("dbNameLabel"))
-        , m_xETDatabasename(m_xBuilder->weld_entry("dbNameEntry"))
-        , m_xFTHostname(m_xBuilder->weld_label("hostNameLabel"))
-        , m_xETHostname(m_xBuilder->weld_entry("hostNameEntry"))
-        , m_xFTPortNumber(m_xBuilder->weld_label("portNumLabel"))
-        , m_xFTDefaultPortNumber(m_xBuilder->weld_label("portNumDefLabel"))
-        , m_xNFPortNumber(m_xBuilder->weld_spin_button("portNumEntry"))
-        , m_xFTDriverClass(m_xBuilder->weld_label("jdbcDriverLabel"))
-        , m_xETDriverClass(m_xBuilder->weld_entry("jdbcDriverEntry"))
-        , m_xPBTestJavaDriver(m_xBuilder->weld_button("testDriverButton"))
+        , m_xHeaderText(m_xBuilder->weld_label(u"header"_ustr))
+        , m_xFTHelpText(m_xBuilder->weld_label(u"helpLabel"_ustr))
+        , m_xFTDatabasename(m_xBuilder->weld_label(u"dbNameLabel"_ustr))
+        , m_xETDatabasename(m_xBuilder->weld_entry(u"dbNameEntry"_ustr))
+        , m_xFTHostname(m_xBuilder->weld_label(u"hostNameLabel"_ustr))
+        , m_xETHostname(m_xBuilder->weld_entry(u"hostNameEntry"_ustr))
+        , m_xFTPortNumber(m_xBuilder->weld_label(u"portNumLabel"_ustr))
+        , m_xFTDefaultPortNumber(m_xBuilder->weld_label(u"portNumDefLabel"_ustr))
+        , m_xNFPortNumber(m_xBuilder->weld_spin_button(u"portNumEntry"_ustr))
+        , m_xFTDriverClass(m_xBuilder->weld_label(u"jdbcDriverLabel"_ustr))
+        , m_xETDriverClass(m_xBuilder->weld_entry(u"jdbcDriverEntry"_ustr))
+        , m_xPBTestJavaDriver(m_xBuilder->weld_button(u"testDriverButton"_ustr))
     {
         m_xFTDriverClass->set_label(DBA_RES(pDriverClassId));
 
@@ -448,7 +455,7 @@ using namespace ::com::sun::star;
         OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
 
         // to get the correct value when saveValue was called by base class
-        if ( m_xETDriverClass->get_text().trim().isEmpty() )
+        if ( o3tl::trim(m_xETDriverClass->get_text()).empty() )
         {
             m_xETDriverClass->set_text(m_sDefaultJdbcDriverName);
             m_xETDriverClass->save_value();
@@ -461,13 +468,13 @@ using namespace ::com::sun::star;
 
     IMPL_LINK_NOARG(OGeneralSpecialJDBCConnectionPageSetup, OnTestJavaClickHdl, weld::Button&, void)
     {
-        OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+        assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
 
         bool bSuccess = false;
 #if HAVE_FEATURE_JAVA
         try
         {
-            if ( !m_xETDriverClass->get_text().trim().isEmpty() )
+            if ( !o3tl::trim(m_xETDriverClass->get_text()).empty() )
             {
 // TODO change jvmaccess
                 ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( m_pAdminDialog->getORB() );
@@ -479,7 +486,7 @@ using namespace ::com::sun::star;
         {
         }
 #endif
-        const char *pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        TranslateId pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const MessageType mt = bSuccess ? MessageType::Info : MessageType::Error;
         OSQLMessageBox aMsg(GetFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt);
         aMsg.run();
@@ -488,8 +495,8 @@ using namespace ::com::sun::star;
     void OGeneralSpecialJDBCConnectionPageSetup::callModifiedHdl(weld::Widget* pControl)
     {
         if (pControl == m_xETDriverClass.get())
-            m_xPBTestJavaDriver->set_sensitive( !m_xETDriverClass->get_text().trim().isEmpty() );
-        bool bRoadmapState = ((!m_xETDatabasename->get_text().isEmpty() ) && ( !m_xETHostname->get_text().isEmpty() ) && (!m_xNFPortNumber->get_text().isEmpty() ) && ( !m_xETDriverClass->get_text().trim().isEmpty() ));
+            m_xPBTestJavaDriver->set_sensitive( !o3tl::trim(m_xETDriverClass->get_text()).empty() );
+        bool bRoadmapState = ((!m_xETDatabasename->get_text().isEmpty() ) && ( !m_xETHostname->get_text().isEmpty() ) && (!m_xNFPortNumber->get_text().isEmpty() ) && ( !o3tl::trim(m_xETDriverClass->get_text()).empty() ));
         SetRoadmapStateValue(bRoadmapState);
         OGenericAdministrationPage::callModifiedHdl();
     }
@@ -499,13 +506,136 @@ using namespace ::com::sun::star;
         return std::make_unique<OJDBCConnectionPageSetup>(pPage, pController, _rAttrSet);
     }
 
+    // OPostgresConnectionPageSetup
+    OPostgresConnectionPageSetup::OPostgresConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId )
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/postgrespage.ui"_ustr, u"SpecialPostgresPage"_ustr, _rCoreAttrs)
+        , m_nPortId(_nPortId)
+        , m_xETDatabasename(m_xBuilder->weld_entry(u"dbNameEntry"_ustr))
+        , m_xETHostname(m_xBuilder->weld_entry(u"hostNameEntry"_ustr))
+        , m_xNFPortNumber(m_xBuilder->weld_spin_button(u"portNumEntry"_ustr))
+        , m_xConnectionURL(new OConnectionURLEdit(m_xBuilder->weld_entry(u"browseurl"_ustr), m_xBuilder->weld_label(u"browselabel"_ustr)))
+    {
+        m_xETDatabasename->connect_changed(LINK(this, OGenericAdministrationPage, OnControlEntryModifyHdl));
+        m_xETHostname->connect_changed(LINK(this, OGenericAdministrationPage, OnControlEntryModifyHdl));
+        m_xNFPortNumber->connect_value_changed(LINK(this, OGenericAdministrationPage, OnControlSpinButtonModifyHdl));
+        const DbuTypeCollectionItem* pCollectionItem = dynamic_cast<const DbuTypeCollectionItem*>( _rCoreAttrs.GetItem(DSID_TYPECOLLECTION) );
+        if (pCollectionItem)
+            m_pCollection = pCollectionItem->getCollection();
+        OSL_ENSURE(m_pCollection, "OConnectionHelper::OConnectionHelper : really need a DSN type collection !");
+        m_xConnectionURL->SetTypeCollection(m_pCollection);
+
+        SetRoadmapStateValue(false);
+    }
+
+    OPostgresConnectionPageSetup::~OPostgresConnectionPageSetup()
+    {
+    }
+
+    std::unique_ptr<OGenericAdministrationPage> OPostgresConnectionPageSetup::CreatePostgresTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet )
+    {
+        return std::make_unique<OPostgresConnectionPageSetup>(pPage, pController,
+                                                          _rAttrSet,
+                                                          DSID_POSTGRES_PORTNUMBER);
+    }
+
+    void OPostgresConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
+    {
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETDatabasename.get()));
+        _rControlList.emplace_back( new OSaveValueWidgetWrapper<OConnectionURLEdit>( m_xConnectionURL.get() ) );
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETHostname.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::SpinButton>(m_xNFPortNumber.get()));
+    }
+
+    bool OPostgresConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
+    {
+        bool bChangedSomething = false;
+        fillString(*_rSet,m_xConnectionURL.get(), DSID_CONNECTURL, bChangedSomething);
+        fillString(*_rSet,m_xETHostname.get(),DSID_CONN_HOSTNAME,bChangedSomething);
+        fillString(*_rSet,m_xETDatabasename.get(),DSID_DATABASENAME,bChangedSomething);
+        fillInt32(*_rSet,m_xNFPortNumber.get(),m_nPortId,bChangedSomething );
+        return bChangedSomething;
+    }
+
+    void OPostgresConnectionPageSetup::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& /*_rControlList*/)
+    {
+    }
+
+    void OPostgresConnectionPageSetup::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
+    {
+        // check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa)
+        SetRoadmapStateValue(true);
+        bool bValid, bReadonly;
+        getFlags(_rSet, bValid, bReadonly);
+
+        m_xConnectionURL->show();
+        m_xConnectionURL->ShowPrefix( false);
+
+        const SfxStringItem* pDatabaseName = _rSet.GetItem<SfxStringItem>(DSID_DATABASENAME);
+        const SfxStringItem* pUrlItem = _rSet.GetItem<SfxStringItem>(DSID_CONNECTURL);
+        const SfxStringItem* pHostName = _rSet.GetItem<SfxStringItem>(DSID_CONN_HOSTNAME);
+        const SfxInt32Item* pPortNumber = _rSet.GetItem<SfxInt32Item>(m_nPortId);
+
+        if ( bValid )
+        {
+            m_xETDatabasename->set_text(pDatabaseName->GetValue());
+            m_xETDatabasename->save_value();
+
+            OUString sUrl = pUrlItem->GetValue();
+            setURL( sUrl );
+            m_xConnectionURL->save_value();
+
+            m_xETHostname->set_text(pHostName->GetValue());
+            m_xETHostname->save_value();
+
+            m_xNFPortNumber->set_value(pPortNumber->GetValue());
+            m_xNFPortNumber->save_value();
+        }
+
+        OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
+
+        callModifiedHdl();
+    }
+
+    bool OPostgresConnectionPageSetup::commitPage( ::vcl::WizardTypes::CommitPageReason /*_eReason*/ )
+    {
+        return commitURL();
+    }
+
+    bool OPostgresConnectionPageSetup::commitURL()
+    {
+        OUString sURL = m_xConnectionURL->GetTextNoPrefix();
+        setURLNoPrefix(sURL);
+        m_xConnectionURL->SaveValueNoPrefix();
+        return true;
+    }
+
+    void OPostgresConnectionPageSetup::impl_setURL( std::u16string_view _rURL, bool _bPrefix )
+    {
+        OUString sURL( comphelper::string::stripEnd(_rURL, '*') );
+        OSL_ENSURE( m_pCollection, "OConnectionHelper::impl_setURL: have no interpreter for the URLs!" );
+        if ( _bPrefix )
+            m_xConnectionURL->SetText( sURL );
+        else
+            m_xConnectionURL->SetTextNoPrefix( sURL );
+    }
+
+    void OPostgresConnectionPageSetup::setURLNoPrefix( std::u16string_view _rURL )
+    {
+        impl_setURL( _rURL,false);
+    }
+
+    void OPostgresConnectionPageSetup::setURL( std::u16string_view _rURL )
+    {
+        impl_setURL( _rURL, true);
+    }
+
     // OMySQLJDBCConnectionPageSetup
     OJDBCConnectionPageSetup::OJDBCConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
-        : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/jdbcconnectionpage.ui", "JDBCConnectionPage", rCoreAttrs,
+        : OConnectionTabPageSetup(pPage, pController, u"dbaccess/ui/jdbcconnectionpage.ui"_ustr, u"JDBCConnectionPage"_ustr, rCoreAttrs,
                                 STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
-        , m_xFTDriverClass(m_xBuilder->weld_label("jdbcLabel"))
-        , m_xETDriverClass(m_xBuilder->weld_entry("jdbcEntry"))
-        , m_xPBTestJavaDriver(m_xBuilder->weld_button("jdbcButton"))
+        , m_xFTDriverClass(m_xBuilder->weld_label(u"jdbcLabel"_ustr))
+        , m_xETDriverClass(m_xBuilder->weld_entry(u"jdbcEntry"_ustr))
+        , m_xPBTestJavaDriver(m_xBuilder->weld_button(u"jdbcButton"_ustr))
     {
         m_xETDriverClass->connect_changed(LINK(this, OJDBCConnectionPageSetup, OnEditModified));
         m_xPBTestJavaDriver->connect_clicked(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl));
@@ -574,7 +704,7 @@ using namespace ::com::sun::star;
 
     IMPL_LINK_NOARG(OJDBCConnectionPageSetup, OnTestJavaClickHdl, weld::Button&, void)
     {
-        OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+        assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
         bool bSuccess = false;
 #if HAVE_FEATURE_JAVA
         try
@@ -591,7 +721,7 @@ using namespace ::com::sun::star;
         {
         }
 #endif
-        const char* pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
+        TranslateId pMessage = bSuccess ? STR_JDBCDRIVER_SUCCESS : STR_JDBCDRIVER_NO_SUCCESS;
         const MessageType mt = bSuccess ? MessageType::Info : MessageType::Error;
         OSQLMessageBox aMsg(GetFrameWeld(), DBA_RES(pMessage), OUString(), MessBoxStyle::Ok | MessBoxStyle::DefaultOk, mt);
         aMsg.run();
@@ -612,9 +742,9 @@ using namespace ::com::sun::star;
     }
 
     OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
-        : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage",
+        : OConnectionTabPageSetup(pPage, pController, u"dbaccess/ui/dbwizspreadsheetpage.ui"_ustr, u"DBWizSpreadsheetPage"_ustr,
                                  rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
-        , m_xPasswordrequired(m_xBuilder->weld_check_button("passwordrequired"))
+        , m_xPasswordrequired(m_xBuilder->weld_check_button(u"passwordrequired"_ustr))
     {
         m_xPasswordrequired->connect_toggled(LINK(this, OGenericAdministrationPage, OnControlModifiedButtonClick));
     }
@@ -630,7 +760,7 @@ using namespace ::com::sun::star;
     void OSpreadSheetConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
     {
         OConnectionTabPageSetup::fillControls(_rControlList);
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xPasswordrequired.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xPasswordrequired.get()));
 
     }
 
@@ -647,12 +777,12 @@ using namespace ::com::sun::star;
     }
 
     OAuthentificationPageSetup::OAuthentificationPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
-        : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/authentificationpage.ui", "AuthentificationPage", _rCoreAttrs)
-        , m_xFTHelpText(m_xBuilder->weld_label("helptext"))
-        , m_xFTUserName(m_xBuilder->weld_label("generalUserNameLabel"))
-        , m_xETUserName(m_xBuilder->weld_entry("generalUserNameEntry"))
-        , m_xCBPasswordRequired(m_xBuilder->weld_check_button("passRequiredCheckbutton"))
-        , m_xPBTestConnection(m_xBuilder->weld_button("testConnectionButton"))
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/authentificationpage.ui"_ustr, u"AuthentificationPage"_ustr, _rCoreAttrs)
+        , m_xFTHelpText(m_xBuilder->weld_label(u"helptext"_ustr))
+        , m_xFTUserName(m_xBuilder->weld_label(u"generalUserNameLabel"_ustr))
+        , m_xETUserName(m_xBuilder->weld_entry(u"generalUserNameEntry"_ustr))
+        , m_xCBPasswordRequired(m_xBuilder->weld_check_button(u"passRequiredCheckbutton"_ustr))
+        , m_xPBTestConnection(m_xBuilder->weld_button(u"testConnectionButton"_ustr))
     {
         m_xETUserName->connect_changed(LINK(this,OGenericAdministrationPage,OnControlEntryModifyHdl));
         m_xCBPasswordRequired->connect_toggled(LINK(this,OGenericAdministrationPage,OnControlModifiedButtonClick));
@@ -673,7 +803,7 @@ using namespace ::com::sun::star;
     void OAuthentificationPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
     {
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETUserName.get()));
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBPasswordRequired.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBPasswordRequired.get()));
     }
 
     void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, bool /*_bSaveValue*/)
@@ -710,15 +840,15 @@ using namespace ::com::sun::star;
     }
 
     OFinalDBPageSetup::OFinalDBPageSetup(weld::Container* pPage, ODbTypeWizDialogSetup* pController, const SfxItemSet& _rCoreAttrs)
-        : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/finalpagewizard.ui", "PageFinal", _rCoreAttrs)
-        , m_xFTFinalHeader(m_xBuilder->weld_label("headerText"))
-        , m_xFTFinalHelpText(m_xBuilder->weld_label("helpText"))
-        , m_xRBRegisterDataSource(m_xBuilder->weld_radio_button("yesregister"))
-        , m_xRBDontregisterDataSource(m_xBuilder->weld_radio_button("noregister"))
-        , m_xFTAdditionalSettings(m_xBuilder->weld_label("additionalText"))
-        , m_xCBOpenAfterwards(m_xBuilder->weld_check_button("openediting"))
-        , m_xCBStartTableWizard(m_xBuilder->weld_check_button("usewizard"))
-        , m_xFTFinalText(m_xBuilder->weld_label("finishText"))
+        : OGenericAdministrationPage(pPage, pController, u"dbaccess/ui/finalpagewizard.ui"_ustr, u"PageFinal"_ustr, _rCoreAttrs)
+        , m_xFTFinalHeader(m_xBuilder->weld_label(u"headerText"_ustr))
+        , m_xFTFinalHelpText(m_xBuilder->weld_label(u"helpText"_ustr))
+        , m_xRBRegisterDataSource(m_xBuilder->weld_radio_button(u"yesregister"_ustr))
+        , m_xRBDontregisterDataSource(m_xBuilder->weld_radio_button(u"noregister"_ustr))
+        , m_xFTAdditionalSettings(m_xBuilder->weld_label(u"additionalText"_ustr))
+        , m_xCBOpenAfterwards(m_xBuilder->weld_check_button(u"openediting"_ustr))
+        , m_xCBStartTableWizard(m_xBuilder->weld_check_button(u"usewizard"_ustr))
+        , m_xFTFinalText(m_xBuilder->weld_label(u"finishText"_ustr))
     {
         m_xCBOpenAfterwards->connect_toggled(LINK(this, OFinalDBPageSetup, OnOpenSelected));
         m_xRBRegisterDataSource->set_active(true);
@@ -754,10 +884,10 @@ using namespace ::com::sun::star;
 
     void OFinalDBPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
     {
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBOpenAfterwards.get()));
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBStartTableWizard.get()));
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRBRegisterDataSource.get()));
-        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRBDontregisterDataSource.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBOpenAfterwards.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBStartTableWizard.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xRBRegisterDataSource.get()));
+        _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xRBDontregisterDataSource.get()));
     }
 
     void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, bool /*_bSaveValue*/)
@@ -775,7 +905,7 @@ using namespace ::com::sun::star;
         return true;
     }
 
-    IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, weld::ToggleButton&, rBox, void)
+    IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, weld::Toggleable&, rBox, void)
     {
         m_xCBStartTableWizard->set_sensitive(rBox.get_sensitive() && rBox.get_active());
     }