summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/evoab
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/evoab')
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LCatalog.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LCatalog.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumnAlias.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumnAlias.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumns.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LColumns.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConfigAccess.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConfigAccess.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConnection.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LConnection.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDatabaseMetaData.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDatabaseMetaData.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDebug.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDebug.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDriver.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LDriver.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LFolderList.cxx24
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LFolderList.hxx2
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LNoException.cxx20
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LPreparedStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LPreparedStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LResultSet.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LResultSet.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LServices.cxx48
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LStatement.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LStatement.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTable.cxx30
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTable.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTables.cxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/LTables.hxx0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/evoab.xml0
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/exports.dxp1
-rwxr-xr-x[-rw-r--r--]connectivity/source/drivers/evoab/makefile.mk0
33 files changed, 38 insertions, 87 deletions
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index 25e06e2b90c0..25e06e2b90c0 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
index b8a205a38c83..b8a205a38c83 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ b/connectivity/source/drivers/evoab/LCatalog.hxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index 7d005bbf5fbe..7d005bbf5fbe 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
index 419d158fa105..419d158fa105 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index 5d69f28290b9..5d69f28290b9 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
index 5be028cdfe2e..5be028cdfe2e 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ b/connectivity/source/drivers/evoab/LColumns.hxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index 2181de964ac4..2181de964ac4 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx
index c19c63c00750..c19c63c00750 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.hxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 725f24ff2236..725f24ff2236 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx
index 9d7df3e3d713..9d7df3e3d713 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.hxx
+++ b/connectivity/source/drivers/evoab/LConnection.hxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index 77821cb6137b..77821cb6137b 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
index ebd693874818..ebd693874818 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx
index b28e06c55b7e..b28e06c55b7e 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.cxx
+++ b/connectivity/source/drivers/evoab/LDebug.cxx
diff --git a/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx
index eeb9eed1860f..eeb9eed1860f 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.hxx
+++ b/connectivity/source/drivers/evoab/LDebug.hxx
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 637203e787d9..637203e787d9 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index 65b15c50cd3f..65b15c50cd3f 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 99f7b6bb930e..b276b1f06ff0 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
// -------------------------------------------------------------------------
void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
- BOOL bRead = TRUE;
+ sal_Bool bRead = sal_True;
QuotedTokenizedString aHeaderLine;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -106,7 +106,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
m_aPrecisions.reserve(nFieldCount);
m_aScales.reserve(nFieldCount);
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
// read description
sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -124,11 +124,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
aColumnName += String::CreateFromInt32(i+1);
sal_Int32 eType;
- UINT16 nPrecision = 0;
- UINT16 nScale = 0;
+ sal_uInt16 nPrecision = 0;
+ sal_uInt16 nScale = 0;
- BOOL bNumeric = FALSE;
- ULONG nIndex = 0;
+ sal_Bool bNumeric = sal_False;
+ sal_uIntPtr nIndex = 0;
// first without fielddelimiter
String aField;
@@ -136,7 +136,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
if (aField.Len() == 0 ||
(pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
@@ -148,11 +148,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
if (aField2.Len() == 0)
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
- bNumeric = TRUE;
+ bNumeric = sal_True;
xub_StrLen nDot = 0;
for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
@@ -162,7 +162,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
(!cThousandDelimiter || c != cThousandDelimiter) &&
!aCharClass.isDigit(aField2,j))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -174,7 +174,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
}
if (nDot > 1) // if there is more than one dot it isn't a number
- bNumeric = FALSE;
+ bNumeric = sal_False;
if (bNumeric && cThousandDelimiter)
{
// Is the delimiter given correctly?
@@ -187,7 +187,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
continue;
else
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
}
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index 81f1f032bc3b..f6cb1ac985ea 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -64,7 +64,7 @@ namespace connectivity
private:
void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
- BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+ sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
sal_Bool fetchRow(OValueRow _rRow,const OSQLColumns& _rCols);
sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition);
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index fdeefbd8735b..3b223ddd943b 100644..100755
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -41,20 +41,20 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
return 0;
xub_StrLen nTokCount = 1;
- BOOL bStart = TRUE; // Are we on the fist character of the token?
- BOOL bInString = FALSE; // Are we within a (cStrDel delimited) string?
+ sal_Bool bStart = sal_True; // Are we on the fist character of the token?
+ sal_Bool bInString = sal_False; // Are we within a (cStrDel delimited) string?
// Search for the first not-matching character (search ends at the end of string)
for( xub_StrLen i = 0; i < Len(); i++ )
{
if (bStart)
{
- bStart = FALSE;
+ bStart = sal_False;
// First character a string delimiter?
if ((*this).GetChar(i) == cStrDel)
{
- bInString = TRUE; // then we are within a string!
- continue; // read next character!
+ bInString = sal_True; // then we are within a string!
+ continue; // read next character!
}
}
@@ -70,7 +70,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
else
{
// end of String
- bInString = FALSE;
+ bInString = sal_False;
}
}
} else {
@@ -78,7 +78,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
if ( (*this).GetChar(i) == cTok )
{
nTokCount++;
- bStart = TRUE;
+ bStart = sal_True;
}
}
}
@@ -94,7 +94,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
xub_StrLen nLen = Len();
if ( nLen )
{
- BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
+ sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
// Is the first character a String-Delimiter?
if (bInString )
@@ -116,7 +116,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
else
{
// end of String
- bInString = FALSE;
+ bInString = sal_False;
}
}
else
@@ -151,7 +151,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
{
if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
{
- BOOL bRead2;
+ sal_Bool bRead2;
do
{
bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
index fee0905e29ab..fee0905e29ab 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
index 700768c686c0..700768c686c0 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 4ff0e701f8a4..4ff0e701f8a4 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx
index ebd64292e911..ebd64292e911 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.hxx
+++ b/connectivity/source/drivers/evoab/LResultSet.hxx
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index f6603140e245..b0f7016c5e72 100644..100755
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -30,13 +30,11 @@
#include "precompiled_connectivity.hxx"
#include "LDriver.hxx"
#include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
using namespace connectivity::evoab;
using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
using ::com::sun::star::lang::XSingleServiceFactory;
using ::com::sun::star::lang::XMultiServiceFactory;
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
rtl_ModuleCount* _pT
);
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
- const OUString& aServiceImplName,
- const Sequence< OUString>& Services,
- const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
- OUString aMainKeyName;
- aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
- aMainKeyName += aServiceImplName;
- aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
- Reference< ::com::sun::star::registry::XRegistryKey > xNewKey( xKey->createKey(aMainKeyName) );
- OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
- for (sal_Int32 i=0; i<Services.getLength(); ++i)
- xNewKey->createKey(Services[i]);
-}
-
//---------------------------------------------------------------------------------------
struct ProviderRequest
{
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
}
//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
- void* /*pServiceManager*/,
- void* pRegistryKey
- )
-{
- if (pRegistryKey)
- try
- {
- Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
- REGISTER_PROVIDER(
- OEvoabDriver::getImplementationName_Static(),
- OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
- return sal_True;
- }
- catch (::com::sun::star::registry::InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
- }
-
- return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplementationName,
void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx
index a6350f11139b..a6350f11139b 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.cxx
+++ b/connectivity/source/drivers/evoab/LStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx
index a870c4722034..a870c4722034 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.hxx
+++ b/connectivity/source/drivers/evoab/LStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index e55d6fbca410..70df1622e8b1 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::lang;
// -------------------------------------------------------------------------
void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
{
- BOOL bRead = TRUE;
+ sal_Bool bRead = sal_True;
QuotedTokenizedString aHeaderLine;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -115,7 +115,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
m_aPrecisions.reserve(nFieldCount);
m_aScales.reserve(nFieldCount);
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
// read description
sal_Unicode cDecimalDelimiter = pConnection->getDecimalDelimiter();
@@ -141,11 +141,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
//OSL_TRACE("OEvoabTable::aColumnName = %s\n", ((OUtoCStr(::rtl::OUString(aColumnName))) ? (OUtoCStr(::rtl::OUString(aColumnName))):("NULL")) );
sal_Int32 eType;
- UINT16 nPrecision = 0;
- UINT16 nScale = 0;
+ sal_uInt16 nPrecision = 0;
+ sal_uInt16 nScale = 0;
- BOOL bNumeric = FALSE;
- ULONG nIndex = 0;
+ sal_Bool bNumeric = sal_False;
+ sal_uIntPtr nIndex = 0;
// first without fielddelimiter
String aField;
@@ -155,7 +155,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
if (aField.Len() == 0 ||
(pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
@@ -169,11 +169,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
if (aField2.Len() == 0)
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
}
else
{
- bNumeric = TRUE;
+ bNumeric = sal_True;
xub_StrLen nDot = 0;
for (xub_StrLen j = 0; j < aField2.Len(); j++)
{
@@ -183,7 +183,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
(!cThousandDelimiter || c != cThousandDelimiter) &&
!aCharClass.isDigit(aField2,j))
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -195,7 +195,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
}
if (nDot > 1) // if there is more than one dot it isn't a number
- bNumeric = FALSE;
+ bNumeric = sal_False;
if (bNumeric && cThousandDelimiter)
{
// is the delimiter given correctly
@@ -208,7 +208,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
continue;
else
{
- bNumeric = FALSE;
+ bNumeric = sal_False;
break;
}
}
@@ -510,7 +510,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
*(_rRow->get())[0] = m_nFilePos;
if (!bRetrieveData)
- return TRUE;
+ return sal_True;
OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
// Fields:
@@ -669,7 +669,7 @@ sal_Bool OEvoabTable::setColumnAliases()
aColumnFinalName = aColumnReadName;
sColumnFinalName = aColumnFinalName;
- sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+ sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
::rtl::OUString aTypeName;
aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
sdbcx::OColumn* pColumn = new sdbcx::OColumn(sColumnFinalName,aTypeName,::rtl::OUString(),
@@ -695,7 +695,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
{
if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
{
- BOOL bRead2;
+ sal_Bool bRead2;
do
{
bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx
index 998086be4985..998086be4985 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.hxx
+++ b/connectivity/source/drivers/evoab/LTable.hxx
diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index 26b5009683c6..26b5009683c6 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx
index ef2c3f838da3..ef2c3f838da3 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.hxx
+++ b/connectivity/source/drivers/evoab/LTables.hxx
diff --git a/connectivity/source/drivers/evoab/evoab.xml b/connectivity/source/drivers/evoab/evoab.xml
index f2bafcffdada..f2bafcffdada 100644..100755
--- a/connectivity/source/drivers/evoab/evoab.xml
+++ b/connectivity/source/drivers/evoab/evoab.xml
diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ b/connectivity/source/drivers/evoab/exports.dxp
@@ -1,3 +1,2 @@
component_getImplementationEnvironment
-component_writeInfo
component_getFactory
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 82e0ce4b70b0..82e0ce4b70b0 100644..100755
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk