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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Fri May 29 20:47:30 UTC 2020


 dbaccess/source/ui/dlg/TablesSingleDlg.cxx |    5 -----
 dbaccess/source/ui/dlg/tablespage.cxx      |    4 ----
 dbaccess/source/ui/inc/TablesSingleDlg.hxx |    1 -
 3 files changed, 10 deletions(-)

New commits:
commit bde0aac4ccf7b830b5ef21d5b9e75e62aee6aaf9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri May 29 14:46:21 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri May 29 22:46:57 2020 +0200

    Clean up dead code
    
    The sole consumer of sURL in OTableSubscriptionPage::implInitControls had been
    removed with 32171521e23453dba193acba7cff455e436e3bac "INTEGRATION: CWS hsqldb".
    
    Change-Id: I198c3204281fb99d21dd403de22abf74231ffe35
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95138
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 52babf2b1523..bcf039c5e16d 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -85,11 +85,6 @@ void OTableSubscriptionDialog::clearPassword()
     m_pImpl->clearPassword();
 }
 
-OUString OTableSubscriptionDialog::getConnectionURL() const
-{
-    return m_pImpl->getConnectionURL();
-}
-
 Reference< XPropertySet > const & OTableSubscriptionDialog::getCurrentDataSource()
 {
     return m_pImpl->getCurrentDataSource();
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index eb39f0b27bf7..8b91b354be37 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -189,10 +189,6 @@ namespace dbaui
 
             // fill the table list with this connection information
             SQLExceptionInfo aErrorInfo;
-            // the current DSN
-            OUString sURL;
-            if ( m_pTablesDlg )
-                sURL = m_pTablesDlg->getConnectionURL();
 
             try
             {
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 2cb947a9fee8..6e73555b6892 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -58,7 +58,6 @@ class ODbDataSourceAdministrationHelper;
         void        successfullyConnected();
         bool        getCurrentSettings(css::uno::Sequence< css::beans::PropertyValue >& _rDriverParams);
         void        clearPassword();
-        OUString    getConnectionURL() const;
         css::uno::Reference< css::beans::XPropertySet > const & getCurrentDataSource();
         void endExecution() { m_bStopExecution = true; }
 


More information about the Libreoffice-commits mailing list