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

INTEGRATION: CWS insight01 (1.4.64); FILE MERGED

Browse source 
2004/03/11 09:04:00 oj 1.4.64.2: #111075# changes for closing
2003/10/24 06:36:48 oj 1.4.64.1: #i21643# import filter changes
This commit is contained in:
Jens-Heiner Rechtien 2004-08-02 15:08:51 +00:00
parent 76f4ffd33d
commit 0cca997af1
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
dbaccess/source/ui/misc/datasourceconnector.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: datasourceconnector.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: hr $ $Date: 2003-03-19 17:52:53 $
* last change: $Author: hr $ $Date: 2004-08-02 16:08:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -148,7 +148,7 @@ namespace dbaui
{
Reference< XInterface > xContext = m_xORB->createInstance(SERVICE_SDB_DATABASECONTEXT);
OSL_ENSURE(xContext.is(), "ODatasourceConnector::implConstruct: got no data source context!");
m_xDatabaseContext = Reference< XNameAccess >(xContext, UNO_QUERY);
m_xDatabaseContext.set(xContext,UNO_QUERY);
OSL_ENSURE(m_xDatabaseContext.is() || !xContext.is(), "ODatasourceConnector::ODatasourceConnector: missing the XNameAccess interface on the data source context!");
}
catch(const Exception&)
@ -168,7 +168,7 @@ namespace dbaui
return xConnection;
// get the data source
Reference< XPropertySet > xDatasource;
Reference< XDataSource > xDatasource;
try
{
m_xDatabaseContext->getByName(_rDataSourceName) >>= xDatasource;
@ -176,23 +176,32 @@ namespace dbaui
catch(Exception&)
{
}
return connect(xDatasource,_bShowError);
}
//---------------------------------------------------------------------
Reference< XConnection > ODatasourceConnector::connect(const Reference< XDataSource>& _xDataSource, sal_Bool _bShowError) const
{
Reference< XConnection > xConnection;
if (!xDatasource.is())
OSL_ENSURE(isValid(), "ODatasourceConnector::connect: invalid object!");
if (!isValid())
return xConnection;
if (!_xDataSource.is())
{
OSL_ENSURE(sal_False,( ::rtl::OString("ODatasourceConnector::connect: could not retrieve the data source named ")
+= ::rtl::OString(_rDataSourceName.getStr(), _rDataSourceName.getLength(), osl_getThreadTextEncoding())
+= ::rtl::OString(" !")).getStr());
OSL_ENSURE(sal_False, "ODatasourceConnector::connect: could not retrieve the data source!");
return xConnection;
}
// get user/password
::rtl::OUString sPassword, sUser;
sal_Bool bPwdRequired = sal_False;
Reference<XPropertySet> xProp(_xDataSource,UNO_QUERY);
try
{
xDatasource->getPropertyValue(PROPERTY_PASSWORD) >>= sPassword;
bPwdRequired = ::cppu::any2bool(xDatasource->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED));
xDatasource->getPropertyValue(PROPERTY_USER) >>= sUser;
xProp->getPropertyValue(PROPERTY_PASSWORD) >>= sPassword;
xProp->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED) >>= bPwdRequired;
xProp->getPropertyValue(PROPERTY_USER) >>= sUser;
}
catch(Exception&)
{
@ -205,7 +214,7 @@ namespace dbaui
{
if (bPwdRequired && !sPassword.getLength())
{ // password required, but empty -> connect using an interaction handler
Reference< XCompletedConnection > xConnectionCompletion(xDatasource, UNO_QUERY);
Reference< XCompletedConnection > xConnectionCompletion(_xDataSource, UNO_QUERY);
if (!xConnectionCompletion.is())
{
OSL_ENSURE(sal_False, "ODatasourceConnector::connect: missing an interface ... need an error message here!");
@ -225,8 +234,7 @@ namespace dbaui
}
else
{
Reference< XDataSource > xDataSource(xDatasource,UNO_QUERY);
xConnection = xDataSource->getConnection(sUser, sPassword);
xConnection = _xDataSource->getConnection(sUser, sPassword);
}
}
catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); }