[Libreoffice-commits] core.git: dbaccess/source
Stephan Bergmann
sbergman at redhat.com
Fri Dec 15 10:18:56 UTC 2017
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 4 ++--
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 2 +-
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 4 ++--
dbaccess/source/ui/dlg/adminpages.cxx | 2 +-
dbaccess/source/ui/dlg/advancedsettings.cxx | 2 +-
dbaccess/source/ui/dlg/dbadmin.cxx | 2 +-
dbaccess/source/ui/dlg/dbwiz.cxx | 2 +-
dbaccess/source/ui/dlg/dbwizsetup.cxx | 2 +-
dbaccess/source/ui/inc/IItemSetHelper.hxx | 2 +-
dbaccess/source/ui/inc/UserAdminDlg.hxx | 2 +-
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 2 +-
dbaccess/source/ui/inc/dbadmin.hxx | 2 +-
dbaccess/source/ui/inc/dbwiz.hxx | 2 +-
dbaccess/source/ui/inc/dbwizsetup.hxx | 2 +-
14 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 6d03c1367f0955900194287805324a8b4144e124
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 15 08:58:54 2017 +0100
sal_Bool -> bool
Change-Id: If2e527d915d07b3b44d2a36e10704665ab8c7320
Reviewed-on: https://gerrit.libreoffice.org/46502
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index a09de194faa4..bb47bb39b41f 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -343,9 +343,9 @@ void ODbDataSourceAdministrationHelper::clearPassword()
m_pItemSetHelper->getWriteOutputSet()->ClearItem(DSID_PASSWORD);
}
-std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection()
+std::pair< Reference<XConnection>,bool> ODbDataSourceAdministrationHelper::createConnection()
{
- std::pair< Reference<XConnection>,sal_Bool> aRet;
+ std::pair< Reference<XConnection>,bool> aRet;
aRet.second = false;
Sequence< PropertyValue > aConnectionParams;
if ( getCurrentSettings(aConnectionParams) )
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 945a8dbec435..4089bdc3e455 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -94,7 +94,7 @@ namespace dbaui
/** creates a new connection. The caller is responsible to dispose it !!!!
*/
- std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection();
+ std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection();
/** return the corresponding driver for the selected URL
*/
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 4cd2fc4da71a..2146c506a889 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -141,14 +141,14 @@ namespace dbaui
{
return m_pItemSet;
}
- std::pair< Reference<XConnection>,sal_Bool> OUserAdminDlg::createConnection()
+ std::pair< Reference<XConnection>,bool> OUserAdminDlg::createConnection()
{
if ( !m_xConnection.is() )
{
m_xConnection = m_pImpl->createConnection().first;
m_bOwnConnection = m_xConnection.is();
}
- return std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,false);
+ return std::pair< Reference<XConnection>,bool> (m_xConnection,false);
}
Reference< XComponentContext > OUserAdminDlg::getORB() const
{
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index bf1caccd2417..987bca7031a4 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -241,7 +241,7 @@ namespace dbaui
bool bShowMessage = true;
try
{
- std::pair< Reference<XConnection>,sal_Bool> aConnectionPair = m_pAdminDialog->createConnection();
+ std::pair< Reference<XConnection>,bool> aConnectionPair = m_pAdminDialog->createConnection();
bShowMessage = aConnectionPair.second;
bSuccess = aConnectionPair.first.is();
::comphelper::disposeComponent(aConnectionPair.first);
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 1f1501dd0c16..6fc2d8263ee4 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -501,7 +501,7 @@ namespace dbaui
return m_pExampleSet;
}
- std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection()
+ std::pair< Reference< XConnection >, bool > AdvancedSettingsDialog::createConnection()
{
return m_pImpl->createConnection();
}
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index f920b70eae14..6c92062ef60e 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -265,7 +265,7 @@ SfxItemSet* ODbAdminDialog::getWriteOutputSet()
return m_pExampleSet;
}
-std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection()
+std::pair< Reference<XConnection>,bool> ODbAdminDialog::createConnection()
{
return m_pImpl->createConnection();
}
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 5f442463b0b2..1388511d992d 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -206,7 +206,7 @@ SfxItemSet* ODbTypeWizDialog::getWriteOutputSet()
return m_pOutSet;
}
-std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialog::createConnection()
+std::pair< Reference<XConnection>,bool> ODbTypeWizDialog::createConnection()
{
return m_pImpl->createConnection();
}
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 44fff07cca7f..5392fc408700 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -403,7 +403,7 @@ SfxItemSet* ODbTypeWizDialogSetup::getWriteOutputSet()
return m_pOutSet;
}
-std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialogSetup::createConnection()
+std::pair< Reference<XConnection>,bool> ODbTypeWizDialogSetup::createConnection()
{
return m_pImpl->createConnection();
}
diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx
index 080a648988a5..6cc2c555e165 100644
--- a/dbaccess/source/ui/inc/IItemSetHelper.hxx
+++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx
@@ -51,7 +51,7 @@ namespace dbaui
{
public:
virtual css::uno::Reference< css::uno::XComponentContext > getORB() const = 0;
- virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() = 0;
+ virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection() = 0;
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() = 0;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const = 0;
virtual void clearPassword() = 0;
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 577385f3adb4..27bab384caf6 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -68,7 +68,7 @@ namespace dbaui
// forwards to ODbDataSourceAdministrationHelper
virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override;
- virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override;
+ virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection() override;
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 30c075aa21b1..c40b5c104867 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -62,7 +62,7 @@ namespace dbaui
// forwards to ODbDataSourceAdministrationHelper
virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override;
- virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override;
+ virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection() override;
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 466c6b216598..13e5dc7e8825 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -87,7 +87,7 @@ public:
// forwards to ODbDataSourceAdministrationHelper
virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override;
- virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override;
+ virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection() override;
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 06ceb23d1688..6cc13bfe94d3 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -78,7 +78,7 @@ public:
// forwards to ODbDataSourceAdministrationHelper
virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override;
- virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override;
+ virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection() override;
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 6a177b163d30..43dcad1d3ea1 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -104,7 +104,7 @@ public:
// forwards to ODbDataSourceAdministrationHelper
virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override;
- virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override;
+ virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,bool> createConnection() override;
virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override;
virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override;
virtual void clearPassword() override;
More information about the Libreoffice-commits
mailing list