strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#86996# use the connection pool instead of the driver manager

Browse source
This commit is contained in:
Frank Schönheit 2001-05-15 10:25:48 +00:00
parent cb2e3fee78
commit 6c19c9c11a
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbaccess/source/ui/control/tabletree.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: tabletree.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: oj $ $Date: 2001-03-29 08:06:35 $
* last change: $Author: fs $ $Date: 2001-05-15 11:25:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -216,10 +216,10 @@ Reference< XConnection > OTableTreeListBox::UpdateTableList(const ::rtl::OUStrin
Reference< XDriverAccess > xDriverManager;
sCurrentActionError = String(ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER));
// in case an error occures
sCurrentActionError.SearchAndReplaceAscii("#servicename#", (::rtl::OUString)SERVICE_SDBC_DRIVERMANAGER);
sCurrentActionError.SearchAndReplaceAscii("#servicename#", (::rtl::OUString)SERVICE_SDBC_CONNECTIONPOOL);
try
{
xDriverManager = Reference< XDriverAccess >(m_xORB->createInstance(SERVICE_SDBC_DRIVERMANAGER), UNO_QUERY);
xDriverManager = Reference< XDriverAccess >(m_xORB->createInstance(SERVICE_SDBC_CONNECTIONPOOL), UNO_QUERY);
DBG_ASSERT(xDriverManager.is(), "OTableTreeListBox::UpdateTableList : could not instantiate the driver manager, or it does not provide the necessary interface!");
}
catch (Exception& e)
@ -528,6 +528,9 @@ void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rStrin
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.11 2001/03/29 08:06:35 oj
* only assign array when length != 0
*
* Revision 1.10 2001/03/29 07:09:53 oj
* show views the correct way
*

11
dbaccess/source/ui/dlg/dbadmin.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: dbadmin.cxx,v $
*
* $Revision: 1.48 $
* $Revision: 1.49 $
*
* last change: $Author: fs $ $Date: 2001-05-10 13:37:04 $
* last change: $Author: fs $ $Date: 2001-05-15 11:25:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -777,10 +777,10 @@ Reference<XConnection> ODbAdminDialog::createConnection()
Reference< XDriverAccess > xDriverManager;
String sCurrentActionError = String(ModuleRes(STR_COULDNOTCREATE_DRIVERMANAGER));
// in case an error occures
sCurrentActionError.SearchAndReplaceAscii("#servicename#", (::rtl::OUString)SERVICE_SDBC_DRIVERMANAGER);
sCurrentActionError.SearchAndReplaceAscii("#servicename#", (::rtl::OUString)SERVICE_SDBC_CONNECTIONPOOL);
try
{
xDriverManager = Reference< XDriverAccess >(getORB()->createInstance(SERVICE_SDBC_DRIVERMANAGER), UNO_QUERY);
xDriverManager = Reference< XDriverAccess >(getORB()->createInstance(SERVICE_SDBC_CONNECTIONPOOL), UNO_QUERY);
DBG_ASSERT(xDriverManager.is(), "ODbAdminDialog::createConnection: could not instantiate the driver manager, or it does not provide the necessary interface!");
}
catch (Exception& e)
@ -2564,6 +2564,9 @@ IMPL_LINK(ODatasourceSelector, OnButtonPressed, Button*, EMPTYARG)
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
* Revision 1.48 2001/05/10 13:37:04 fs
* #86223# restore view settings after applying (no matter if syncronously or asynchronously / +successfullyConnected to make the password persistent
*
* Revision 1.47 2001/04/27 15:47:03 fs
* resetPages: do a ShowPage(GENERAL) before removing pages
*