summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/calc
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/calc')
-rw-r--r--connectivity/source/drivers/calc/CDatabaseMetaData.cxx28
-rw-r--r--connectivity/source/drivers/calc/CPreparedStatement.cxx5
-rw-r--r--connectivity/source/drivers/calc/CResultSet.cxx21
-rw-r--r--connectivity/source/drivers/calc/CStatement.cxx5
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx12
-rw-r--r--connectivity/source/drivers/calc/CTables.cxx10
-rw-r--r--connectivity/source/drivers/calc/makefile.mk11
7 files changed, 34 insertions, 58 deletions
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 5dd895b6f5c7..942545719e5d 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CDatabaseMetaData.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: oj $ $Date: 2001-03-28 11:32:42 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -117,10 +117,6 @@
#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE calc
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::calc;
using namespace connectivity::file;
@@ -289,16 +285,16 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
xColumns->getByName(*pBegin) >>= xColumn;
OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
- aRow[5] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_TYPE));
- aRow[6] = ::comphelper::getString(xColumn->getPropertyValue(PROPERTY_TYPENAME));
- aRow[7] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_PRECISION));
- // aRow[8] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
- aRow[9] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_SCALE));
- aRow[11] = ::comphelper::getINT32(xColumn->getPropertyValue(PROPERTY_ISNULLABLE));
- // aRow[12] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
- aRow[13] = ::comphelper::getString(xColumn->getPropertyValue(PROPERTY_DEFAULTVALUE));
- // aRow[14] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
- // aRow[15] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
+ aRow[5] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
+ aRow[6] = ::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
+ aRow[7] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+ // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+ aRow[9] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
+ aRow[11] = ::comphelper::getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
+ // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+ aRow[13] = ::comphelper::getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
+ // aRow[14] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+ // aRow[15] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
switch(sal_Int32(aRow[5]))
{
case DataType::CHAR:
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index b16017ae9f61..d0aa2147e942 100644
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CPreparedStatement.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: nn $ $Date: 2001-01-26 19:05:48 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,6 +68,7 @@
using namespace connectivity::calc;
using namespace connectivity::file;
+using namespace com::sun::star::uno;
// -------------------------------------------------------------------------
OResultSet* OCalcPreparedStatement::createResultSet()
{
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index d19b4de1bfe7..dbc7446ee6de 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CResultSet.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-04-30 10:11:26 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,21 +70,6 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE calc
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
-// define the properties of this lib
-// this file includes the properties for this dll
-namespace connectivity
-{
- namespace calc
- {
-#ifndef CONNECTIVITY_USTRINGDESCRIPTION_IMPL_HXX
-#include "UStringDescription_Impl.hxx"
-#endif
- }
-}
using namespace connectivity::calc;
using namespace connectivity::file;
@@ -101,7 +86,7 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
: file::OResultSet(pStmt,_aSQLIterator)
,m_bBookmarkable(sal_True)
{
- registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType());
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType());
}
// -------------------------------------------------------------------------
::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException)
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index c0b134be532f..0f87a9679324 100644
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CStatement.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: nn $ $Date: 2001-01-26 19:05:48 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,6 +68,7 @@
using namespace connectivity::calc;
using namespace connectivity::file;
+using namespace com::sun::star::uno;
// -------------------------------------------------------------------------
OResultSet* OCalcStatement::createResultSet()
{
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 6b64ac6781ee..7e621143fd5e 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CTable.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: oj $ $Date: 2001-05-07 10:37:51 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -146,10 +146,6 @@
#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE calc
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
#include <unotools/ucbstreamhelper.hxx>
#endif
@@ -874,13 +870,13 @@ sal_Bool OCalcTable::fetchRow( OValueRow _rRow, const OSQLColumns & _rCols,
Reference< XPropertySet> xColumn = *aIter;
// ::rtl::OUString aName;
-// xColumn->getPropertyValue(PROPERTY_NAME) >>= aName;
+// xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aName;
sal_Int32 nType;
if(_bUseTableDefs)
nType = m_aTypes[i-1];
else
- xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType;
+ xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
if ((*_rRow)[i].isBound())
lcl_SetValue( (*_rRow)[i], m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders,
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 27f5de7311e2..e70611ee24f4 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: CTables.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 14:07:20 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,10 +92,6 @@
#ifndef _CONNECTIVITY_CALC_CATALOG_HXX_
#include "calc/CCatalog.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE calc
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
#endif
@@ -145,7 +141,7 @@ void SAL_CALL OCalcTables::appendByDescriptor( const Reference< XPropertySet >&
{
::osl::MutexGuard aGuard(m_rMutex);
- ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
+ ::rtl::OUString aName = getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
ObjectMap::iterator aIter = m_aNameMap.find(aName);
if( aIter != m_aNameMap.end())
throw ElementExistException(aName,*this);
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 93e276173a19..3e3dcff38d8d 100644
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: pluby $ $Date: 2001-03-23 23:46:05 $
+# last change: $Author: oj $ $Date: 2001-05-14 11:40:01 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -110,16 +110,17 @@ SHL1STDLIBS=\
$(UCBHELPERLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
+ $(DBFILELIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB)
-.IF "$(COMPHELPERLIB)" == ""
-SHL1STDLIBS+= icomphelp2.lib
+
+.IF "$(DBFILELIB)" == ""
+SHL1STDLIBS+= ifile$(UPD).lib
.ENDIF
SHL1DEPN=
SHL1IMPLIB= i$(TARGET)
-SHL1LIBS= $(SLB)$/file.lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
generated by cgit (git 2.34.1) at 2025-05-02 16:58:37 +0000