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

WaE: signed/unsigned etc.

Browse Source 
Change-Id: I3e2e43f5854b8bc33a442ecd25e089d20a122018
This commit is contained in:
Caolán McNamara 2012-05-29 10:15:06 +01:00
parent a4849e9d2b
commit d567a320b2
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/inc/connectivity/sqlnode.hxx
View File

@ -272,7 +272,7 @@ namespace connectivity
void setParent(OSQLParseNode* pParseNode) {m_pParent = pParseNode;}; void setParent(OSQLParseNode* pParseNode) {m_pParent = pParseNode;};
sal_uInt32 count() const {return m_aChildren.size();}; size_t count() const {return m_aChildren.size();};
inline OSQLParseNode* getChild(sal_uInt32 nPos) const; inline OSQLParseNode* getChild(sal_uInt32 nPos) const;
void append(OSQLParseNode* pNewSubTree); void append(OSQLParseNode* pNewSubTree);

4
connectivity/source/drivers/mozab/MPreparedStatement.cxx
View File

@ -408,11 +408,11 @@ ORowSetValue& x)
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol) size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
{ {
OSL_UNUSED( pParameter ); OSL_UNUSED( pParameter );
// Count of the newly added Parameters // Count of the newly added Parameters
sal_uInt32 nParameter = m_xParamColumns->get().size()+1; size_t nParameter = m_xParamColumns->get().size()+1;
OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter"); OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument is not a Parameter");
OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree"); OSL_ENSURE(pParameter->count() > 0,"OResultSet: error in parse tree");

2
connectivity/source/drivers/mozab/MPreparedStatement.hxx
View File

@ -97,7 +97,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex); void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, size_t AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);

14
connectivity/source/drivers/mozab/MResultSet.cxx
View File

@ -886,8 +886,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
OSQLParseNode *pOptEscape; OSQLParseNode *pOptEscape;
const OSQLParseNode* pPart2 = parseTree->getChild(1); const OSQLParseNode* pPart2 = parseTree->getChild(1);
pColumn = parseTree->getChild(0); // Match Item pColumn = parseTree->getChild(0); // Match Item
pAtom = pPart2->getChild(pPart2->count()-2); // Match String pAtom = pPart2->getChild(static_cast<sal_uInt32>(pPart2->count()-2)); // Match String
pOptEscape = pPart2->getChild(pPart2->count()-1); // Opt Escape Rule pOptEscape = pPart2->getChild(static_cast<sal_uInt32>(pPart2->count()-1)); // Opt Escape Rule
(void)pOptEscape; (void)pOptEscape;
const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT); const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT);
@ -1297,7 +1297,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
} }
m_pKeySet = m_pSortIndex->CreateKeySet(); m_pKeySet = m_pSortIndex->CreateKeySet();
m_CurrentRowCount = m_pKeySet->get().size(); m_CurrentRowCount = static_cast<sal_Int32>(m_pKeySet->get().size());
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ ) for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ )
OSL_TRACE("Sorted: %d -> %d", i, (m_pKeySet->get())[i] ); OSL_TRACE("Sorted: %d -> %d", i, (m_pKeySet->get())[i] );
@ -1405,7 +1405,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
{ {
if(_bSetColumnMapping) if(_bSetColumnMapping)
{ {
sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; sal_Int32 nSelectColumnPos = static_cast<sal_Int32>(aIter - _rxColumns->get().begin() + 1);
// the getXXX methods are 1-based ... // the getXXX methods are 1-based ...
sal_Int32 nTableColumnPos = i + 1; sal_Int32 nTableColumnPos = i + 1;
// get first table column is the bookmark column // get first table column is the bookmark column
@ -1490,7 +1490,7 @@ sal_Bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber)
sal_Int32 OResultSet::deletedCount() sal_Int32 OResultSet::deletedCount()
{ {
impl_ensureKeySet(); impl_ensureKeySet();
return m_CurrentRowCount - m_pKeySet->get().size(); return m_CurrentRowCount - static_cast<sal_Int32>(m_pKeySet->get().size());
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -1559,7 +1559,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
if ( nCurCard > nNumberOfRecords && m_aQuery.queryComplete()) { if ( nCurCard > nNumberOfRecords && m_aQuery.queryComplete()) {
fillKeySet(nNumberOfRecords); fillKeySet(nNumberOfRecords);
m_nRowPos = m_pKeySet->get().size() + 1; m_nRowPos = static_cast<sal_uInt32>(m_pKeySet->get().size() + 1);
OSL_TRACE("seekRow: return False, m_nRowPos = %u", m_nRowPos ); OSL_TRACE("seekRow: return False, m_nRowPos = %u", m_nRowPos );
return sal_False; return sal_False;
} }
@ -1908,7 +1908,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE
else else
m_nUpdatedRow = 0; m_nUpdatedRow = 0;
m_nRowPos = m_pKeySet->get().size(); m_nRowPos = static_cast<sal_uInt32>(m_pKeySet->get().size());
fetchCurrentRow(); fetchCurrentRow();
OSL_TRACE("moveToInsertRow out, m_nRowPos = %u", m_nRowPos ); OSL_TRACE("moveToInsertRow out, m_nRowPos = %u", m_nRowPos );
} }

2
connectivity/source/drivers/mozab/MResultSetMetaData.cxx
View File

@ -70,7 +70,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) thr
sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException)
{ {
return (m_xColumns->get()).size(); return static_cast<sal_Int32>((m_xColumns->get()).size());
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------

2
connectivity/source/drivers/mozab/MStatement.cxx
View File

@ -492,7 +492,7 @@ void OCommonStatement::createColumnMapping()
::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns();
m_aColMapping.resize(xColumns->get().size() + 1); m_aColMapping.resize(xColumns->get().size() + 1);
for (i=0; i<m_aColMapping.size(); ++i) for (i=0; i<m_aColMapping.size(); ++i)
m_aColMapping[i] = i; m_aColMapping[i] = static_cast<sal_Int32>(i);
Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY);
// now check which columns are bound // now check which columns are bound

2
connectivity/source/inc/TSortIndex.hxx
View File

@ -106,7 +106,7 @@ namespace connectivity
// look at the name // look at the name
sal_Bool IsFrozen() const { return m_bFrozen; } sal_Bool IsFrozen() const { return m_bFrozen; }
// returns the current size of the keyvalues // returns the current size of the keyvalues
sal_Int32 Count() const { return m_aKeyValues.size(); } size_t Count() const { return m_aKeyValues.size(); }
inline const ::std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } inline const ::std::vector<OKeyType>& getKeyType() const { return m_aKeyType; }
inline TAscendingOrder getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } inline TAscendingOrder getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; }