mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connectivity: sal_Bool->bool

Browse Source 
Change-Id: Ic583deda8b0be3c89bcd644a1872ebd83276487a
This commit is contained in:
Noel Grandin
2014-03-31 15:23:51 +02:00
parent cb66ea3604
commit 2c7bef7b8d
20 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
connectivity/source/commontools/CommonTools.cxx
View File

@@ -54,7 +54,7 @@ namespace connectivity
const sal_Unicode CHAR_PLACE = '_'; const sal_Unicode CHAR_PLACE = '_';
const sal_Unicode CHAR_WILD = '%'; const sal_Unicode CHAR_WILD = '%';
sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape) bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape)
{ {
int pos=0; int pos=0;
int flag=0; int flag=0;
@@ -65,14 +65,14 @@ namespace connectivity
{ {
case CHAR_PLACE: case CHAR_PLACE:
if ( *pStr == 0 ) if ( *pStr == 0 )
return sal_False; return false;
break; break;
default: default:
if (*pWild && (*pWild == cEscape) && ((*(pWild+1)== CHAR_PLACE) || (*(pWild+1) == CHAR_WILD)) ) if (*pWild && (*pWild == cEscape) && ((*(pWild+1)== CHAR_PLACE) || (*(pWild+1) == CHAR_WILD)) )
pWild++; pWild++;
if ( rtl_ascii_toUpperCase(*pWild) != rtl_ascii_toUpperCase(*pStr) ) if ( rtl_ascii_toUpperCase(*pWild) != rtl_ascii_toUpperCase(*pStr) )
if ( !pos ) if ( !pos )
return sal_False; return false;
else else
pWild += pos; pWild += pos;
else else
@@ -82,7 +82,7 @@ namespace connectivity
while ( *pWild == CHAR_WILD ) while ( *pWild == CHAR_WILD )
pWild++; pWild++;
if ( *pWild == 0 ) if ( *pWild == 0 )
return sal_True; return true;
flag = 1; flag = 1;
pos = 0; pos = 0;
if ( *pStr == 0 ) if ( *pStr == 0 )
@@ -155,9 +155,9 @@ namespace connectivity
return aRet; return aRet;
} }
sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ) bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName )
{ {
sal_Bool bRet = sal_False; bool bRet = false;
if ( _pJVM.is() ) if ( _pJVM.is() )
{ {
jvmaccess::VirtualMachine::AttachGuard aGuard(_pJVM); jvmaccess::VirtualMachine::AttachGuard aGuard(_pJVM);

4
connectivity/source/commontools/TColumnsHelper.cxx
View File

@@ -59,10 +59,10 @@ namespace connectivity
} }
OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent
,sal_Bool _bCase ,bool _bCase
,::osl::Mutex& _rMutex ,::osl::Mutex& _rMutex
,const TStringVector &_rVector ,const TStringVector &_rVector
,sal_Bool _bUseHardRef ,bool _bUseHardRef
) : OCollection(_rParent,_bCase,_rMutex,_rVector,sal_False,_bUseHardRef) ) : OCollection(_rParent,_bCase,_rMutex,_rVector,sal_False,_bUseHardRef)
,m_pImpl(NULL) ,m_pImpl(NULL)
,m_pTable(NULL) ,m_pTable(NULL)

6
connectivity/source/commontools/TIndex.cxx
View File

@@ -43,9 +43,9 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
OIndexHelper::OIndexHelper( OTableHelper* _pTable, OIndexHelper::OIndexHelper( OTableHelper* _pTable,
const OUString& _Name, const OUString& _Name,
const OUString& _Catalog, const OUString& _Catalog,
sal_Bool _isUnique, bool _isUnique,
sal_Bool _isPrimaryKeyIndex, bool _isPrimaryKeyIndex,
sal_Bool _isClustered bool _isClustered
) : connectivity::sdbcx::OIndex(_Name, ) : connectivity::sdbcx::OIndex(_Name,
_Catalog, _Catalog,
_isUnique, _isUnique,

4
connectivity/source/commontools/TTableHelper.cxx
View File

@@ -141,7 +141,7 @@ namespace connectivity
OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
const Reference< XConnection >& _xConnection, const Reference< XConnection >& _xConnection,
sal_Bool _bCase) bool _bCase)
:OTable_TYPEDEF(_pTables,_bCase) :OTable_TYPEDEF(_pTables,_bCase)
,m_pImpl(new OTableHelperImpl(_xConnection)) ,m_pImpl(new OTableHelperImpl(_xConnection))
{ {
@@ -149,7 +149,7 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
OTableHelper::OTableHelper( sdbcx::OCollection* _pTables, OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
const Reference< XConnection >& _xConnection, const Reference< XConnection >& _xConnection,
sal_Bool _bCase, bool _bCase,
const OUString& _Name, const OUString& _Name,
const OUString& _Type, const OUString& _Type,
const OUString& _Description , const OUString& _Description ,

2
connectivity/source/commontools/dbtools.cxx
View File

@@ -2017,7 +2017,7 @@ void release(oslInterlockedCount& _refCount,
osl_atomic_increment( &_refCount ); osl_atomic_increment( &_refCount );
} }
void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) void checkDisposed(bool _bThrow) throw ( DisposedException )
{ {
if (_bThrow) if (_bThrow)
throw DisposedException(); throw DisposedException();

6
connectivity/source/commontools/predicateinput.cxx
View File

@@ -365,14 +365,14 @@ namespace dbtools
0, 0,
0, 0,
nType, nType,
sal_False, false,
sal_False, false,
xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
OUString(), OUString(),
OUString(), OUString(),
OUString()); OUString());
Reference<XPropertySet> xColumn = pColumn; Reference<XPropertySet> xColumn = pColumn;
pColumn->setFunction(sal_True); pColumn->setFunction(true);
pColumn->setRealName(sField); pColumn->setRealName(sField);
OSQLParseNode* pParseNode = implPredicateTree( sError, _rPredicateValue, xColumn ); OSQLParseNode* pParseNode = implPredicateTree( sError, _rPredicateValue, xColumn );

4
connectivity/source/drivers/file/FPreparedStatement.cxx
View File

@@ -503,8 +503,8 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
,nPrecision ,nPrecision
,nScale ,nScale
,eType ,eType
,sal_False ,false
,sal_False ,false
,m_aSQLIterator.isCaseSensitive() ,m_aSQLIterator.isCaseSensitive()
,OUString() ,OUString()
,OUString() ,OUString()

4
connectivity/source/drivers/firebird/Columns.cxx
View File

@@ -26,11 +26,11 @@ Columns::Columns(Table& rTable,
Mutex& rMutex, Mutex& rMutex,
const TStringVector& rVector): const TStringVector& rVector):
OColumnsHelper(rTable, OColumnsHelper(rTable,
sal_True, // TODO: is this case sensitivity? true, // TODO: is this case sensitivity?
rMutex, rMutex,
rVector) rVector)
{ {
OColumnsHelper::setParent(&rTable); OColumnsHelper::setParent(&rTable);
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

6
connectivity/source/drivers/firebird/Table.cxx
View File

@@ -39,7 +39,7 @@ Table::Table(Tables* pTables,
const uno::Reference< XConnection >& rConnection): const uno::Reference< XConnection >& rConnection):
OTableHelper(pTables, OTableHelper(pTables,
rConnection, rConnection,
sal_True), true),
m_rMutex(rMutex), m_rMutex(rMutex),
m_nPrivileges(0) m_nPrivileges(0)
{ {
@@ -54,7 +54,7 @@ Table::Table(Tables* pTables,
const OUString& rDescription): const OUString& rDescription):
OTableHelper(pTables, OTableHelper(pTables,
rConnection, rConnection,
sal_True, true,
rName, rName,
rType, rType,
rDescription, rDescription,
@@ -259,4 +259,4 @@ OUString Table::getAlterTableColumn(const OUString& rColumn)
return ("ALTER TABLE \"" + getName() + "\" ALTER COLUMN \"" + rColumn + "\" "); return ("ALTER TABLE \"" + getName() + "\" ALTER COLUMN \"" + rColumn + "\" ");
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

4
connectivity/source/drivers/hsqldb/HTable.cxx
View File

@@ -56,7 +56,7 @@ using namespace ::com::sun::star::lang;
OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
const Reference< XConnection >& _xConnection) const Reference< XConnection >& _xConnection)
:OTableHelper(_pTables,_xConnection,sal_True) :OTableHelper(_pTables,_xConnection,true)
{ {
// we create a new table here, so we should have all the rights or ;-) // we create a new table here, so we should have all the rights or ;-)
m_nPrivileges = Privilege::DROP | m_nPrivileges = Privilege::DROP |
@@ -81,7 +81,7 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
sal_Int32 _nPrivileges sal_Int32 _nPrivileges
) : OTableHelper( _pTables, ) : OTableHelper( _pTables,
_xConnection, _xConnection,
sal_True, true,
_Name, _Name,
_Type, _Type,
_Description, _Description,

2
connectivity/source/drivers/mork/MTable.cxx
View File

@@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang;
OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
const OUString& _Name, const OUString& _Type, const OUString& _Description ) const OUString& _Name, const OUString& _Type, const OUString& _Description )
:OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description ) :OTable_Base(_pTables, _pConnection, true, _Name, _Type, _Description )
,m_pConnection( _pConnection ) ,m_pConnection( _pConnection )
{ {
construct(); construct();

4
connectivity/source/drivers/mysql/YTable.cxx
View File

@@ -75,7 +75,7 @@ namespace connectivity
OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables, OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables,
const Reference< XConnection >& _xConnection) const Reference< XConnection >& _xConnection)
:OTableHelper(_pTables,_xConnection,sal_True) :OTableHelper(_pTables,_xConnection,true)
{ {
// we create a new table here, so we should have all the rights or ;-) // we create a new table here, so we should have all the rights or ;-)
m_nPrivileges = Privilege::DROP | m_nPrivileges = Privilege::DROP |
@@ -100,7 +100,7 @@ OMySQLTable::OMySQLTable( sdbcx::OCollection* _pTables,
sal_Int32 _nPrivileges sal_Int32 _nPrivileges
) : OTableHelper( _pTables, ) : OTableHelper( _pTables,
_xConnection, _xConnection,
sal_True, true,
_Name, _Name,
_Type, _Type,
_Description, _Description,

28
connectivity/source/parse/PColumn.cxx
View File

@@ -35,7 +35,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container; using namespace ::com::sun::star::container;
OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool _bCase) OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn, bool _bCase)
: connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))) : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
, getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
, getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
@@ -52,10 +52,10 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool
, getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME)))
, getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME))) , getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME)))
) )
, m_bFunction(sal_False) , m_bFunction(false)
, m_bDbasePrecisionChanged(sal_False) , m_bDbasePrecisionChanged(false)
, m_bAggregateFunction(sal_False) , m_bAggregateFunction(false)
, m_bIsSearchable( sal_True ) , m_bIsSearchable( true )
{ {
construct(); construct();
} }
@@ -69,9 +69,9 @@ OParseColumn::OParseColumn( const OUString& _Name,
sal_Int32 _Precision, sal_Int32 _Precision,
sal_Int32 _Scale, sal_Int32 _Scale,
sal_Int32 _Type, sal_Int32 _Type,
sal_Bool _IsAutoIncrement, bool _IsAutoIncrement,
sal_Bool _IsCurrency, bool _IsCurrency,
sal_Bool _bCase, bool _bCase,
const OUString& _CatalogName, const OUString& _CatalogName,
const OUString& _SchemaName, const OUString& _SchemaName,
const OUString& _TableName const OUString& _TableName
@@ -90,10 +90,10 @@ OParseColumn::OParseColumn( const OUString& _Name,
_CatalogName, _CatalogName,
_SchemaName, _SchemaName,
_TableName) _TableName)
, m_bFunction(sal_False) , m_bFunction(false)
, m_bDbasePrecisionChanged(sal_False) , m_bDbasePrecisionChanged(false)
, m_bAggregateFunction(sal_False) , m_bAggregateFunction(false)
, m_bIsSearchable( sal_True ) , m_bIsSearchable( true )
{ {
construct(); construct();
} }
@@ -191,7 +191,7 @@ void OParseColumn::construct()
OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUString& i_rOriginatingTableName, OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUString& i_rOriginatingTableName,
sal_Bool _bCase, sal_Bool _bAscending ) bool _bCase, bool _bAscending )
: connectivity::sdbcx::OColumn( : connectivity::sdbcx::OColumn(
getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))), getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))), getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
@@ -215,7 +215,7 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUStr
} }
OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, sal_Bool _bCase, sal_Bool _bAscending ) OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, bool _bCase, bool _bAscending )
: connectivity::sdbcx::OColumn( : connectivity::sdbcx::OColumn(
getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))), getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))), getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),

32
connectivity/source/parse/sqliterator.cxx
View File

@@ -919,9 +919,9 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
{ {
//TODO:Create a new class for create statement to handle field length //TODO:Create a new class for create statement to handle field length
OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,OUString(),OUString(), OParseColumn* pColumn = new OParseColumn(aColumnName,aTypeName,OUString(),OUString(),
ColumnValue::NULLABLE_UNKNOWN,0,0,nType,sal_False,sal_False,isCaseSensitive(), ColumnValue::NULLABLE_UNKNOWN,0,0,nType,false,false,isCaseSensitive(),
OUString(),OUString(),OUString()); OUString(),OUString(),OUString());
pColumn->setFunction(sal_False); pColumn->setFunction(false);
pColumn->setRealName(aColumnName); pColumn->setRealName(aColumnName);
Reference< XPropertySet> xCol = pColumn; Reference< XPropertySet> xCol = pColumn;
@@ -1463,14 +1463,14 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
0, 0,
0, 0,
nType, nType,
sal_False, false,
sal_False, false,
isCaseSensitive(), isCaseSensitive(),
OUString(), OUString(),
OUString(), OUString(),
OUString()); OUString());
pColumn->setFunction(sal_True); pColumn->setFunction(true);
pColumn->setAggregateFunction(sal_True); pColumn->setAggregateFunction(true);
pColumn->setRealName(sFunctionName); pColumn->setRealName(sFunctionName);
m_aParameters->get().push_back(pColumn); m_aParameters->get().push_back(pColumn);
} }
@@ -1530,8 +1530,8 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
0, 0,
0, 0,
nType, nType,
sal_False, false,
sal_False, false,
isCaseSensitive(), isCaseSensitive(),
OUString(), OUString(),
OUString(), OUString(),
@@ -1757,8 +1757,8 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
0, 0,
0, 0,
_nType, _nType,
sal_False, false,
sal_False, false,
isCaseSensitive(), isCaseSensitive(),
OUString(), OUString(),
OUString(), OUString(),
@@ -1776,9 +1776,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
OUString aNewColName(getUniqueColumnName(rColumnAlias)); OUString aNewColName(getUniqueColumnName(rColumnAlias));
OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(),
ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive(), ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,false,false,isCaseSensitive(),
OUString(),OUString(),OUString()); OUString(),OUString(),OUString());
pColumn->setFunction(sal_True); pColumn->setFunction(true);
pColumn->setAggregateFunction(bAggFkt); pColumn->setAggregateFunction(bAggFkt);
pColumn->setRealName(rColumnName); pColumn->setRealName(rColumnName);
@@ -1798,9 +1798,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
OUString aNewColName(getUniqueColumnName(rColumnAlias)); OUString aNewColName(getUniqueColumnName(rColumnAlias));
OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(),
ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,sal_False,sal_False,isCaseSensitive(), ColumnValue::NULLABLE_UNKNOWN,0,0,_nType,false,false,isCaseSensitive(),
OUString(),OUString(),OUString()); OUString(),OUString(),OUString());
pColumn->setFunction(sal_True); pColumn->setFunction(true);
pColumn->setAggregateFunction(bAggFkt); pColumn->setAggregateFunction(bAggFkt);
pColumn->setRealName(rColumnName); pColumn->setRealName(rColumnName);
SAL_WARN("connectivity.parse", "Trying to construct a column with Function==true and a TableName; this makes no sense."); SAL_WARN("connectivity.parse", "Trying to construct a column with Function==true and a TableName; this makes no sense.");
@@ -1838,9 +1838,9 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
OUString aNewColName(getUniqueColumnName(rColumnAlias)); OUString aNewColName(getUniqueColumnName(rColumnAlias));
OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(), OParseColumn* pColumn = new OParseColumn(aNewColName,OUString(),OUString(),OUString(),
ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,sal_False,sal_False,isCaseSensitive(), ColumnValue::NULLABLE_UNKNOWN,0,0,DataType::VARCHAR,false,false,isCaseSensitive(),
OUString(),OUString(),OUString()); OUString(),OUString(),OUString());
pColumn->setFunction(sal_True); pColumn->setFunction(true);
pColumn->setAggregateFunction(bAggFkt); pColumn->setAggregateFunction(bAggFkt);
Reference< XPropertySet> xCol = pColumn; Reference< XPropertySet> xCol = pColumn;

6
dbaccess/source/ui/querydesign/QueryDesignView.cxx
View File

@@ -3059,14 +3059,14 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
0, 0,
0, 0,
nType, nType,
sal_False, false,
sal_False, false,
xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
OUString(), OUString(),
OUString(), OUString(),
OUString()); OUString());
_rxColumn = pColumn; _rxColumn = pColumn;
pColumn->setFunction(sal_True); pColumn->setFunction(true);
pColumn->setRealName(pEntry->GetField()); pColumn->setRealName(pEntry->GetField());
} }
else else

8
include/connectivity/CommonTools.hxx
View File

@@ -51,8 +51,8 @@ namespace jvmaccess { class VirtualMachine; }
namespace connectivity namespace connectivity
{ {
OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); OOO_DLLPUBLIC_DBTOOLS bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape);
inline sal_Bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape) inline bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape)
{ {
return match(rWild.getStr(), rStr.getStr(), cEscape); return match(rWild.getStr(), rStr.getStr(), cEscape);
} }
@@ -150,7 +150,7 @@ namespace connectivity
const OUString& _rVal, const OUString& _rVal,
const ::comphelper::UStringMixEqual& _rCase); const ::comphelper::UStringMixEqual& _rCase);
OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); OOO_DLLPUBLIC_DBTOOLS void checkDisposed(bool _bThrow) throw ( ::com::sun::star::lang::DisposedException );
#if HAVE_FEATURE_JAVA #if HAVE_FEATURE_JAVA
/** creates a java virtual machine /** creates a java virtual machine
@@ -167,7 +167,7 @@ namespace connectivity
@param _sClassName @param _sClassName
The class name to look for. The class name to look for.
*/ */
OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName ); OOO_DLLPUBLIC_DBTOOLS bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName );
#endif #endif
} }

40
include/connectivity/PColumn.hxx
View File

@@ -44,12 +44,12 @@ namespace connectivity
class OOO_DLLPUBLIC_DBTOOLS OParseColumn : class OOO_DLLPUBLIC_DBTOOLS OParseColumn :
public OParseColumn_BASE, public OParseColumn_PROP public OParseColumn_BASE, public OParseColumn_PROP
{ {
OUString m_aRealName; OUString m_aRealName;
OUString m_sLabel; OUString m_sLabel;
sal_Bool m_bFunction; bool m_bFunction;
sal_Bool m_bDbasePrecisionChanged; bool m_bDbasePrecisionChanged;
sal_Bool m_bAggregateFunction; bool m_bAggregateFunction;
sal_Bool m_bIsSearchable; bool m_bIsSearchable;
protected: protected:
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE;
@@ -57,7 +57,7 @@ namespace connectivity
virtual ~OParseColumn(); virtual ~OParseColumn();
public: public:
OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase); OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, bool _bCase);
OParseColumn(const OUString& _Name, OParseColumn(const OUString& _Name,
const OUString& _TypeName, const OUString& _TypeName,
const OUString& _DefaultValue, const OUString& _DefaultValue,
@@ -66,9 +66,9 @@ namespace connectivity
sal_Int32 _Precision, sal_Int32 _Precision,
sal_Int32 _Scale, sal_Int32 _Scale,
sal_Int32 _Type, sal_Int32 _Type,
sal_Bool _IsAutoIncrement, bool _IsAutoIncrement,
sal_Bool _IsCurrency, bool _IsCurrency,
sal_Bool _bCase, bool _bCase,
const OUString& _CatalogName, const OUString& _CatalogName,
const OUString& _SchemaName, const OUString& _SchemaName,
const OUString& _TableName); const OUString& _TableName);
@@ -78,16 +78,16 @@ namespace connectivity
void setRealName(const OUString& _rName) { m_aRealName = _rName; } void setRealName(const OUString& _rName) { m_aRealName = _rName; }
void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; } void setLabel(const OUString& i_sLabel) { m_sLabel = i_sLabel; }
void setTableName(const OUString& _rName) { m_TableName = _rName; } void setTableName(const OUString& _rName) { m_TableName = _rName; }
void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } void setFunction(bool _bFunction) { m_bFunction = _bFunction; }
void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } void setAggregateFunction(bool _bFunction) { m_bAggregateFunction = _bFunction; }
void setIsSearchable( sal_Bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } void setIsSearchable( bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; }
void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } void setDbasePrecisionChanged(bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; }
const OUString& getRealName() const { return m_aRealName; } const OUString& getRealName() const { return m_aRealName; }
const OUString& getLabel() const { return m_sLabel; } const OUString& getLabel() const { return m_sLabel; }
const OUString& getTableName() const { return m_TableName; } const OUString& getTableName() const { return m_TableName; }
sal_Bool getFunction() const { return m_bFunction; } bool getFunction() const { return m_bFunction; }
sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; }
public: public:
/** creates a collection of OParseColumn, as described by a result set meta data instance. /** creates a collection of OParseColumn, as described by a result set meta data instance.
@@ -134,14 +134,14 @@ namespace connectivity
OOrderColumn( OOrderColumn(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
const OUString& i_rOriginatingTableName, const OUString& i_rOriginatingTableName,
sal_Bool _bCase, bool _bCase,
sal_Bool _bAscending bool _bAscending
); );
OOrderColumn( OOrderColumn(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
sal_Bool _bCase, bool _bCase,
sal_Bool _bAscending bool _bAscending
); );
virtual void construct() SAL_OVERRIDE; virtual void construct() SAL_OVERRIDE;

4
include/connectivity/TColumnsHelper.hxx
View File

@@ -44,10 +44,10 @@ namespace connectivity
virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE; virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) SAL_OVERRIDE;
public: public:
OColumnsHelper( ::cppu::OWeakObject& _rParent OColumnsHelper( ::cppu::OWeakObject& _rParent
,sal_Bool _bCase ,bool _bCase
,::osl::Mutex& _rMutex ,::osl::Mutex& _rMutex
,const TStringVector &_rVector ,const TStringVector &_rVector
,sal_Bool _bUseHardRef = sal_True ,bool _bUseHardRef = true
); );
virtual ~OColumnsHelper(); virtual ~OColumnsHelper();

6
include/connectivity/TIndex.hxx
View File

@@ -37,9 +37,9 @@ namespace connectivity
OIndexHelper( OTableHelper* _pTable, OIndexHelper( OTableHelper* _pTable,
const OUString& _Name, const OUString& _Name,
const OUString& _Catalog, const OUString& _Catalog,
sal_Bool _isUnique, bool _isUnique,
sal_Bool _isPrimaryKeyIndex, bool _isPrimaryKeyIndex,
sal_Bool _isClustered bool _isClustered
); );
inline OTableHelper* getTable() const { return m_pTable; } inline OTableHelper* getTable() const { return m_pTable; }
}; };

4
include/connectivity/TTableHelper.hxx
View File

@@ -127,10 +127,10 @@ namespace connectivity
public: public:
OTableHelper( sdbcx::OCollection* _pTables, OTableHelper( sdbcx::OCollection* _pTables,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
sal_Bool _bCase); bool _bCase);
OTableHelper( sdbcx::OCollection* _pTables, OTableHelper( sdbcx::OCollection* _pTables,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
sal_Bool _bCase, bool _bCase,
const OUString& _Name, const OUString& _Name,
const OUString& _Type, const OUString& _Type,
const OUString& _Description = OUString(), const OUString& _Description = OUString(),