summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/dbase
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/dbase')
-rw-r--r--connectivity/source/drivers/dbase/DCode.cxx15
-rw-r--r--connectivity/source/drivers/dbase/DDatabaseMetaData.cxx32
-rw-r--r--connectivity/source/drivers/dbase/DIndexColumns.cxx18
-rw-r--r--connectivity/source/drivers/dbase/DIndexes.cxx16
-rw-r--r--connectivity/source/drivers/dbase/DPreparedStatement.cxx5
-rw-r--r--connectivity/source/drivers/dbase/DResultSet.cxx10
-rw-r--r--connectivity/source/drivers/dbase/DStatement.cxx6
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx86
-rw-r--r--connectivity/source/drivers/dbase/DTables.cxx14
-rw-r--r--connectivity/source/drivers/dbase/makefile.mk11
10 files changed, 95 insertions, 118 deletions
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 40e172353668..544c0817990b 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DCode.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2001-05-07 10:46:53 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:39:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,10 +70,6 @@
#ifndef _CONNECTIVITY_DBASE_INDEXITER_HXX_
#include "dbase/DIndexIter.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::dbase;
@@ -92,6 +88,7 @@ OOperandAttr* OFILEAnalyzer::createOperandAttr(sal_Int32 _nPos,
{
return new OFILEOperandAttr(_nPos,_xCol,_xIndexes);
}
+
//------------------------------------------------------------------
OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
const Reference< XPropertySet>& _xColumn,
@@ -114,15 +111,15 @@ OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
{
Reference<XColumnsSupplier> xColsSup(xIndex,UNO_QUERY);
Reference<XNameAccess> xNameAccess = xColsSup->getColumns();
- _xColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
+ _xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sName;
if(xNameAccess->hasByName(sName))
{
m_xIndex = xIndex;
break;
}
- else if(xColInfo->hasPropertyByName(PROPERTY_REALNAME))
+ else if(xColInfo->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME)))
{
- _xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sName;
+ _xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME)) >>= sName;
if(xNameAccess->hasByName(sName))
{
m_xIndex = xIndex;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index b66d283609d6..786aabec0a14 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DDatabaseMetaData.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 13:57:18 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -96,10 +96,6 @@
#ifndef _CONNECTIVITY_DBASE_INDEX_HXX_
#include "dbase/DIndex.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _CONNECTIVITY_FILE_VALUE_HXX_
#include "FValue.hxx"
#endif
@@ -270,16 +266,16 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
::cppu::extractInterface(xColumn,xColumns->getByName(*pBegin));
OSL_ENSURE(xColumn.is(),"Columns contains a column who isn't a fastpropertyset!");
- aRow[5] = getINT32(xColumn->getPropertyValue(PROPERTY_TYPE));
- aRow[6] = getString(xColumn->getPropertyValue(PROPERTY_TYPENAME));
- aRow[7] = getINT32(xColumn->getPropertyValue(PROPERTY_PRECISION));
- // aRow[8] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
- aRow[9] = getINT32(xColumn->getPropertyValue(PROPERTY_SCALE));
- aRow[11] = getINT32(xColumn->getPropertyValue(PROPERTY_ISNULLABLE));
- // aRow[12] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
- aRow[13] = getString(xColumn->getPropertyValue(PROPERTY_DEFAULTVALUE));
- // aRow[14] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
- // aRow[15] = xColumn->getPropertyValue(PROPERTY_TYPENAME);
+ aRow[5] = getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
+ aRow[6] = getString(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
+ aRow[7] = getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+ // aRow[8] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+ aRow[9] = getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
+ aRow[11] = getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
+ // aRow[12] = xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME));
+ aRow[13] = 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:
@@ -405,9 +401,9 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
::cppu::extractInterface(xIndex,xIndexes->getByName(*pBegin));
OSL_ENSURE(xIndex.is(),"Indexes contains a column who isn't a fastpropertyset!");
- if(unique && !getBOOL(xIndex->getPropertyValue(PROPERTY_ISUNIQUE)))
+ if(unique && !getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
continue;
- aRow[4] = getBOOL(xIndex->getPropertyValue(PROPERTY_ISUNIQUE));
+ aRow[4] = getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE)));
aRow[6] = *pBegin;
Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xIndex,UNO_QUERY);
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index dbb4c36ce9c5..a2b60fa84ada 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndexColumns.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-05-08 13:23:12 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,10 +68,6 @@
#ifndef _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_
#include "connectivity/sdbcx/VIndexColumn.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
using namespace connectivity::dbase;
using namespace connectivity;
@@ -97,12 +93,12 @@ Reference< XNamed > ODbaseIndexColumns::createObject(const ::rtl::OUString& _rNa
return Reference< XNamed >();
Reference< XNamed > xRet = new sdbcx::OIndexColumn(sal_True,_rName
- ,getString(xCol->getPropertyValue(PROPERTY_TYPENAME))
+ ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
,::rtl::OUString()
- ,getINT32(xCol->getPropertyValue(PROPERTY_ISNULLABLE))
- ,getINT32(xCol->getPropertyValue(PROPERTY_PRECISION))
- ,getINT32(xCol->getPropertyValue(PROPERTY_SCALE))
- ,getINT32(xCol->getPropertyValue(PROPERTY_TYPE))
+ ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
+ ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
+ ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
+ ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
,sal_False
,sal_False
,sal_False
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index c3774c6df4bd..f55751ce0570 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DIndexes.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 13:57:18 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -64,10 +64,6 @@
#ifndef _CONNECTIVITY_DBASE_INDEX_HXX_
#include "dbase/DIndex.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
#include <unotools/ucbstreamhelper.hxx>
#endif
@@ -92,11 +88,11 @@ Reference< XNamed > ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
// String aPath = pDir->GetName();
// aPath += _rName.getStr();
::rtl::OUString sFile = m_pTable->getConnection()->getURL();
- sFile += STR_DELIMITER;
+ sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
sFile += _rName;
sFile += ::rtl::OUString::createFromAscii(".ndx");
if(!UCBContentHelper::Exists(sFile))
- throw SQLException(::rtl::OUString::createFromAscii("Index file doesn't exists!"),*m_pTable,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(::rtl::OUString::createFromAscii("Index file doesn't exists!"),*m_pTable,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
Reference< XNamed > xRet;
SvStream* pFileStream = UcbStreamHelper::CreateStream(sFile,STREAM_READ | STREAM_NOCREATE| STREAM_SHARE_DENYWRITE);
@@ -115,7 +111,7 @@ Reference< XNamed > ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
pIndex->openIndexFile();
}
else
- throw SQLException(::rtl::OUString::createFromAscii("Could not open index file"),*m_pTable,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(::rtl::OUString::createFromAscii("Could not open index file"),*m_pTable,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
return xRet;
}
// -------------------------------------------------------------------------
@@ -138,7 +134,7 @@ void SAL_CALL ODbaseIndexes::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/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index f53d1ff933ac..eae12dfbaa46 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DPreparedStatement.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2000-09-29 15:29:33 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* 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::dbase;
using namespace connectivity::file;
+using namespace com::sun::star::uno;
// -------------------------------------------------------------------------
OResultSet* ODbasePreparedStatement::createResultSet()
{
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index ed4f62d35c91..5860b9ba85bd 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DResultSet.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: oj $ $Date: 2001-05-10 14:30:43 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,10 +70,6 @@
#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _CONNECTIVITY_DBASE_INDEX_HXX_
#include "dbase/DIndex.hxx"
#endif
@@ -99,7 +95,7 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
: 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 ODbaseResultSet::getImplementationName( ) throw ( RuntimeException)
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index c9b88917209b..3509a513e5a4 100644
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DStatement.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: oj $ $Date: 2000-09-29 15:29:39 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -68,6 +68,8 @@
using namespace connectivity::dbase;
using namespace connectivity::file;
+using namespace com::sun::star::uno;
+
// -------------------------------------------------------------------------
OResultSet* ODbaseStatement::createResultSet()
{
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 5f3d3f2eb81e..33e6434869ea 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DTable.cxx,v $
*
- * $Revision: 1.43 $
+ * $Revision: 1.44 $
*
- * last change: $Author: oj $ $Date: 2001-05-11 06:13:41 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -117,10 +117,6 @@
#ifndef _COMPHELPER_EXTRACT_HXX_
#include <comphelper/extract.hxx>
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
#include <unotools/ucbstreamhelper.hxx>
#endif
@@ -719,7 +715,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols, sal_B
Reference< XPropertySet> xColumn = *aIter;
::rtl::OUString aName;
- xColumn->getPropertyValue(PROPERTY_NAME) >>= aName;
+ xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aName;
// Laengen je nach Datentyp:
// nyi: eine zentrale Funktion, die die Laenge liefert!
sal_Int32 nLen;
@@ -731,8 +727,8 @@ sal_Bool ODbaseTable::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols, sal_B
}
else
{
- xColumn->getPropertyValue(PROPERTY_PRECISION) >>= nLen;
- xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType;
+ xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nLen;
+ xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
}
switch(nType)
{
@@ -741,7 +737,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols, sal_B
if(_bUseTableDefs)
nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,m_aScales[i-1]);
else
- nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32(xColumn->getPropertyValue(PROPERTY_SCALE)));
+ nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32(xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
break; // das Vorzeichen und das Komma
case DataType::BIT: nLen = 1; break;
case DataType::LONGVARCHAR: nLen = 10; break;
@@ -1114,21 +1110,21 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
char cTyp;
- xCol->getPropertyValue(PROPERTY_NAME) >>= aName;
+ xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aName;
if (aName.getLength() > nMaxFieldLength)
{
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Invalid column name length for column: ");
sMsg += aName;
sMsg += ::rtl::OUString::createFromAscii("!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
}
ByteString aCol(aName.getStr(), getConnection()->getTextEncoding());
(*m_pFileStream) << aCol.GetBuffer();
m_pFileStream->Write(aBuffer, 11 - aCol.Len());
- switch (getINT32(xCol->getPropertyValue(PROPERTY_TYPE)))
+ switch (getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
{
case DataType::CHAR:
case DataType::VARCHAR:
@@ -1159,7 +1155,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Invalid column type for column: ");
sMsg += aName;
sMsg += ::rtl::OUString::createFromAscii("!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
}
}
@@ -1167,9 +1163,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
m_pFileStream->Write(aBuffer, 4);
sal_Int32 nPrecision = 0;
- xCol->getPropertyValue(PROPERTY_PRECISION) >>= nPrecision;
+ xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nPrecision;
sal_Int32 nScale = 0;
- xCol->getPropertyValue(PROPERTY_SCALE) >>= nScale;
+ xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale;
switch(cTyp)
{
@@ -1180,7 +1176,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Invalid precision for column: ");
sMsg += aName;
sMsg += ::rtl::OUString::createFromAscii("!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
}
(*m_pFileStream) << (BYTE) Min((ULONG)nPrecision, 255UL); //Feldlnge
nRecLength += (USHORT)Min((ULONG)nPrecision, 255UL);
@@ -1195,10 +1191,10 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Precision is less than scale for column: ");
sMsg += aName;
sMsg += ::rtl::OUString::createFromAscii("!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
break;
}
- if (getBOOL(xCol->getPropertyValue(PROPERTY_ISCURRENCY))) // Currency wird gesondert behandelt
+ if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency wird gesondert behandelt
{
(*m_pFileStream) << (BYTE)10; // Standard Laenge
(*m_pFileStream) << (BYTE)4;
@@ -1234,7 +1230,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Invalid column type for column: ");
sMsg += aName;
sMsg += ::rtl::OUString::createFromAscii("!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
}
}
m_pFileStream->Write(aBuffer, 14);
@@ -1437,7 +1433,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
::cppu::extractInterface(xCol,m_pColumns->getByIndex(i));
// const SdbFILEColumn *pColumn = (const SdbFILEColumn *)(*aOriginalColumns)[i];
- xCol->getPropertyValue(PROPERTY_NAME) >>= aColName;
+ xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
Reference<XPropertySet> xIndex = isUniqueByColumnName(aColName);
if (xIndex.is())
{
@@ -1452,7 +1448,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
{
// Reference<XPropertySet> xFindCol;
// _xCols->getByIndex(nPos) >>= xFindCol;
- if(aCase(getString((*aIter)->getPropertyValue(PROPERTY_REALNAME)),aColName))
+ if(aCase(getString((*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME))),aColName))
break;
}
if (aIter == _rCols.end())
@@ -1641,7 +1637,7 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(const ::rtl::OUString&
for(sal_Int32 i=0;i<m_pIndexes->getCount();++i)
{
::cppu::extractInterface(xIndex,m_pIndexes->getByIndex(i));
- if(xIndex.is() && getBOOL(xIndex->getPropertyValue(PROPERTY_ISUNIQUE)))
+ if(xIndex.is() && getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE))))
{
Reference<XNameAccess> xCols(Reference<XColumnsSupplier>(xIndex,UNO_QUERY)->getColumns());
if(xCols->hasByName(_rColName))
@@ -1687,7 +1683,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
for (i = 0; i < m_pColumns->getCount(); i++)
{
m_pColumns->getByIndex(i) >>= xCol;
- xCol->getPropertyValue(PROPERTY_NAME) >>= aColName;
+ xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
// const SdbFILEColumn *pColumn = (const SdbFILEColumn *)(*aOriginalColumns)[i];
sal_Int32 nPos = 0;
@@ -1695,7 +1691,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
{
Reference<XPropertySet> xFindCol;
::cppu::extractInterface(xFindCol,_xCols->getByIndex(nPos));
- if(aCase(getString(xFindCol->getPropertyValue(PROPERTY_NAME)),aColName))
+ if(aCase(getString(xFindCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),aColName))
break;
}
if (nPos >= _xCols->getCount())
@@ -1721,7 +1717,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
{
// es existiert kein eindeutiger Wert
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Dupilcate value found!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
}
}
}
@@ -1732,17 +1728,17 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
for (i = 0; i < m_pColumns->getCount(); i++)
{
m_pColumns->getByIndex(i) >>= xCol;
- xCol->getPropertyValue(PROPERTY_NAME) >>= aColName;
+ xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
// Laengen je nach Datentyp:
// nyi: eine zentrale Funktion, die die Laenge liefert!
- sal_Int32 nLen = getINT32(xCol->getPropertyValue(PROPERTY_PRECISION));
- sal_Int32 nType = getINT32(xCol->getPropertyValue(PROPERTY_TYPE));
+ sal_Int32 nLen = getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+ sal_Int32 nType = getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
switch (nType)
{
case DataType::DATE: nLen = 8; break;
case DataType::DECIMAL:
- nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32(xCol->getPropertyValue(PROPERTY_SCALE)));
+ nLen = SvDbaseConverter::ConvertPrecisionToDbase(nLen,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))));
break; // das Vorzeichen und das Komma
case DataType::BIT: nLen = 1; break;
case DataType::LONGVARCHAR:nLen = 10; break;
@@ -1755,7 +1751,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
{
Reference<XPropertySet> xFindCol;
::cppu::extractInterface(xFindCol,_xCols->getByIndex(nPos));
- if(aCase(getString(xFindCol->getPropertyValue(PROPERTY_NAME)),aColName))
+ if(aCase(getString(xFindCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),aColName))
break;
}
@@ -1824,8 +1820,8 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
double n = rRow[nPos];
- int nPrecision = (int)getINT32(xCol->getPropertyValue(PROPERTY_PRECISION));
- int nScale = (int)getINT32(xCol->getPropertyValue(PROPERTY_SCALE));
+ int nPrecision = (int)getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+ int nScale = (int)getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
// ein const_cast, da GetFormatPrecision am SvNumberFormat nicht const ist, obwohl es das eigentlich
// sein koennte und muesste
@@ -1891,7 +1887,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueVector& rRow, OValueRow pOrgRow,const Refer
::rtl::OUString sMsg = ::rtl::OUString::createFromAscii("Invalid value for column: ");
sMsg += aColName;
sMsg += ::rtl::OUString::createFromAscii("!");
- throw SQLException(sMsg,*this,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(sMsg,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
}
// Und weiter ...
nByteOffset += nLen;
@@ -1953,23 +1949,23 @@ void ODbaseTable::alterColumn(sal_Int32 index,
// // get the name
// ::rtl::OUString sOldName,sNewName;
-// xOldColumn->getPropertyByName(PROPERTY_NAME) >>= sOldName;
-// descriptor->getPropertyByName(PROPERTY_NAME) >>= sNewName;
+// xOldColumn->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sOldName;
+// descriptor->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sNewName;
//
// // get the type
// sal_Int32 nOldType,nNewType;
-// xOldColumn->getPropertyByName(PROPERTY_TYPE) >>= nOldType;
-// descriptor->getPropertyByName(PROPERTY_TYPE) >>= nNewType;
+// xOldColumn->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType;
+// descriptor->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType;
//
// // get the precision
// sal_Int32 nOldPrec,nNewPrec;
-// xOldColumn->getPropertyByName(PROPERTY_PRECISION) >>= nOldPrec;
-// descriptor->getPropertyByName(PROPERTY_PRECISION) >>= nNewPrec;
+// xOldColumn->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec;
+// descriptor->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)) >>= nNewPrec;
//
// // get the scale
// sal_Int32 nOldScale,nNewScale;
-// xOldColumn->getPropertyByName(PROPERTY_SCALE) >>= nOldScale;
-// descriptor->getPropertyByName(PROPERTY_SCALE) >>= nNewScale;
+// xOldColumn->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale;
+// descriptor->getPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale;
//
// // check if currency changed
// sal_Bool bOldCur,bNewCur;
@@ -1982,7 +1978,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
ODbaseTable* pNewTable = new ODbaseTable(static_cast<ODbaseConnection*>(m_pConnection));
Reference<XPropertySet> xHoldTable = pNewTable;
- pNewTable->setPropertyValue(PROPERTY_NAME,makeAny(::rtl::OUString(sTempName)));
+ pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
// copy the structure
@@ -2069,7 +2065,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
ODbaseTable* pNewTable = new ODbaseTable(static_cast<ODbaseConnection*>(m_pConnection));
Reference<XPropertySet> xHoldTable = pNewTable;
- pNewTable->setPropertyValue(PROPERTY_NAME,makeAny(::rtl::OUString(sTempName)));
+ pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
{
Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
@@ -2113,7 +2109,7 @@ String ODbaseTable::createTempFile()
String sName(m_Name);
TempFile aTempFile(sName,&sExt,&sTempName);
if(!aTempFile.IsValid())
- throw SQLException(::rtl::OUString::createFromAscii("Error while alter table!"),NULL,SQLSTATE_GENERAL,1000,Any());
+ throw SQLException(::rtl::OUString::createFromAscii("Error while alter table!"),NULL,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_HY0000),1000,Any());
INetURLObject aURL;
aURL.SetSmartProtocol(INET_PROT_FILE);
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 82b34f7af9e7..b7059943c30f 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DTables.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2001-03-30 13:57:18 $
+ * last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,10 +92,6 @@
#ifndef _CONNECTIVITY_DBASE_CATALOG_HXX_
#include "dbase/DCatalog.hxx"
#endif
-#define CONNECTIVITY_PROPERTY_NAME_SPACE dbase
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#include "propertyids.hxx"
-#endif
#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
#endif
@@ -140,7 +136,7 @@ void SAL_CALL ODbaseTables::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);
@@ -151,7 +147,7 @@ void SAL_CALL ODbaseTables::appendByDescriptor( const Reference< XPropertySet >&
ODbaseTable* pTable = (ODbaseTable*)xTunnel->getSomething(ODbaseTable::getUnoTunnelImplementationId());
if(pTable)
{
- pTable->setPropertyValue(PROPERTY_NAME,descriptor->getPropertyValue(PROPERTY_NAME));
+ pTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
if(pTable->CreateImpl())
ODbaseTables_BASE_BASE::appendByDescriptor(Reference< XPropertySet >(createObject(aName),UNO_QUERY));
}
@@ -178,7 +174,7 @@ void SAL_CALL ODbaseTables::dropByName( const ::rtl::OUString& elementName ) thr
ODbaseTables_BASE_BASE::dropByName(elementName);
}
else
- throw SQLException(::rtl::OUString::createFromAscii("Can't drop table ") + elementName,*this,SQLSTATE_SEQUENCE,1000,Any());
+ throw SQLException(::rtl::OUString::createFromAscii("Can't drop table ") + elementName,*this,OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ERRORMSG_SEQUENCE),1000,Any());
}
// -------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 7830d605fb57..8c77904c86bf 100644
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.15 $
+# $Revision: 1.16 $
#
-# last change: $Author: oj $ $Date: 2001-05-07 10:37:51 $
+# last change: $Author: oj $ $Date: 2001-05-14 11:37:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -118,16 +118,17 @@ SHL1STDLIBS=\
$(UCBHELPERLIB) \
$(SALLIB) \
$(DBTOOLSLIB) \
+ $(DBFILELIB) \
$(UNOTOOLSLIB) \
$(COMPHELPERLIB)
-.IF "$(COMPHELPERLIB)" == ""
-SHL1STDLIBS+= icomphelp2.lib
+.IF "$(DBFILELIB)" == ""
+SHL1STDLIBS+= ifile$(UPD).lib
.ENDIF
SHL1DEPN=
SHL1IMPLIB= i$(DBASE_TARGET)
-SHL1LIBS= $(SLB)$/file.lib
+
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
generated by cgit (git 2.34.1) at 2025-05-02 19:24:56 +0000