summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
Diffstat (limited to 'dbaccess/source')
-rw-r--r--dbaccess/source/core/api/RowSet.cxx48
-rw-r--r--dbaccess/source/core/api/RowSetBase.hxx9
-rw-r--r--dbaccess/source/core/api/querycomposer.cxx8
-rw-r--r--dbaccess/source/core/api/resultset.hxx10
-rw-r--r--dbaccess/source/core/inc/column.hxx9
-rw-r--r--dbaccess/source/core/inc/querycomposer.hxx10
-rw-r--r--dbaccess/source/core/inc/statement.hxx10
7 files changed, 33 insertions, 71 deletions
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 959a24ce93b4..f5ece804980e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RowSet.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: oj $ $Date: 2000-10-25 07:30:24 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:44:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1670,51 +1670,7 @@ Reference< XConnection > ORowSet::calcConnection() throw( SQLException, Runtime
throw SQLException();
}
}
- else
- {
-#ifdef DEBUG
- Reference<XDriverManager> xMan(m_xServiceManager->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdbc.DriverManager")),UNO_QUERY);
- Sequence<PropertyValue> aInfo(2);
- aInfo[0].Name = ::rtl::OUString::createFromAscii("CharSet");
- aInfo[0].Value <<= RTL_TEXTENCODING_IBM_850;
- aInfo[1].Name = ::rtl::OUString::createFromAscii("Extension");
- aInfo[1].Value <<= ::rtl::OUString::createFromAscii("txt");
-
- m_xActiveConnection = xMan->getConnectionWithInfo(::rtl::OUString::createFromAscii("sdbc:flat:file:///G|/Office50/user/database/"),aInfo);
- if(!m_xActiveConnection.is())
-#endif
- throw SQLException();
-
- }
-// {
-// Reference< XDatabaseEnvironment > xEnvironment(m_xServiceManager->createInstance(SERVICE_SDB_DATABASEENVIRONMENT), UNO_QUERY);
-// if (xEnvironment.is())
-// {
-// Reference< XDataSource > xDataSource(xEnvironment->getDatabaseAccess(m_aDataSourceName), UNO_QUERY);
-// if (xDataSource.is())
-// m_xActiveConnection = xDataSource->getConnection(m_aUser, m_aPassword);
-// }
-// }
}
-// else if (m_aURL.len())
-// {
-// Reference< XDatabaseEnvironment > xEnvironment(m_xServiceManager->createInstance(SERVICE_SDB_DATABASEENVIRONMENT), UNO_QUERY);
-// if (xEnvironment.is())
-// {
-// if (m_aUser.len())
-// {
-// Sequence< PropertyValue > aInfo(2);
-// aInfo.getArray()[0].Name = rtl::OUString::createFromAscii("User");
-// aInfo.getArray()[0].Value <<= m_aUser;
-// aInfo.getArray()[1].Name = rtl::OUString::createFromAscii("Password");
-// aInfo.getArray()[1].Value <<= m_aPassword;
-// m_xActiveConnection = xEnvironment->getConnectionWithInfo(m_aURL, aInfo);
-// }
-// else
-// m_xActiveConnection = xEnvironment->getConnection(m_aURL);
-// }
-// }
-
// listen if the connection disappears
Reference< XComponent > xComponent(m_xActiveConnection, UNO_QUERY);
if (xComponent.is())
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 90b6fa4dda94..c8c01b059b58 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RowSetBase.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: oj $ $Date: 2000-10-17 10:18:12 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:44:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -106,6 +106,9 @@
#ifndef DBACCESS_CORE_API_ROWSETROW_HXX
#include "RowSetRow.hxx"
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
namespace connectivity { class OSQLParseTreeIterator; }
@@ -125,7 +128,7 @@ namespace dbaccess
class ORowSetCache;
class ORowSetDataColumns;
- class ORowSetBase : public connectivity::OBaseMutex,
+ class ORowSetBase : public comphelper::OBaseMutex,
public ORowSetBase_BASE,
public ::comphelper::OPropertyContainer,
public ::comphelper::OPropertyArrayUsageHelper<ORowSetBase> // this class hold the static property info
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index c536f3500e6e..bd497d7ecf42 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querycomposer.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: kz $ $Date: 2000-10-24 14:25:11 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:44:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,13 +92,9 @@
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
-#if SUPD > 610
#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
#include "dbastrings.hrc"
#endif
-#else
-#include "stringconstants.hrc"
-#endif
#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include <cppuhelper/typeprovider.hxx>
#endif
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index f5d61a76e1e6..a305b6f1c48c 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: resultset.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 11:18:12 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:44:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -115,8 +115,8 @@
#ifndef _DBA_COREAPI_COLUMN_HXX_
#include <column.hxx>
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include <connectivity/CommonTools.hxx>
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
@@ -137,7 +137,7 @@ typedef ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface>
//************************************************************
// OResultSet
//************************************************************
-class OResultSet : public connectivity::OBaseMutex,
+class OResultSet : public comphelper::OBaseMutex,
public OResultSetBase,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OResultSet >
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index f53a7a1e55b5..4dfe35816610 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: column.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fs $ $Date: 2000-10-18 16:07:50 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:40:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -122,6 +122,9 @@
#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include <connectivity/CommonTools.hxx>
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_
#include <connectivity/sdbcx/VCollection.hxx>
#endif
@@ -140,7 +143,7 @@ typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::lang::XServiceInfo
//------------------------------------------------------------
class OColumnSettings;
-class OColumn :public connectivity::OBaseMutex
+class OColumn :public comphelper::OBaseMutex
,public OColumnBase
,public ::cppu::OPropertySetHelper
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index f6310320cb8d..fad13457f690 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: querycomposer.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2000-10-24 12:59:42 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:40:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,6 +91,10 @@
#ifndef _TOOLS_INTN_HXX
#include <tools/intn.hxx>
#endif
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
+#endif
+
namespace com { namespace sun { namespace star { namespace util {
@@ -105,7 +109,7 @@ namespace dbaccess
::com::sun::star::sdbcx::XColumnsSupplier,
::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE;
- class OQueryComposer : public ::connectivity::OBaseMutex,
+ class OQueryComposer : public ::comphelper::OBaseMutex,
public OSubComponent,
public OQueryComposer_BASE
{
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index f0efb184d742..038b6d653d0d 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: statement.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: fs $ $Date: 2000-10-11 11:07:08 $
+ * last change: $Author: oj $ $Date: 2000-10-26 09:40:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -94,13 +94,13 @@
#ifndef _DBASHARED_APITOOLS_HXX_
#include "apitools.hxx"
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
-#include <connectivity/CommonTools.hxx>
+#ifndef _COMPHELPER_BROADCASTHELPER_HXX_
+#include <comphelper/broadcasthelper.hxx>
#endif
//************************************************************
// OStatementBase
//************************************************************
-class OStatementBase : public connectivity::OBaseMutex,
+class OStatementBase : public comphelper::OBaseMutex,
public OSubComponent,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >,
generated by cgit (git 2.34.1) at 2025-05-16 08:02:16 +0000