diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 10:51:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-13 13:50:37 +0000 |
| commit | a556802b52c6d0089cb289de4d41c1cc8409bcac (patch) | |
| tree | 921fe7303e90a39c6239fdfa2864ec0d4ca4e048 /connectivity/source/drivers | |
| parent | 2d2e1267be7ebb1843bed44ea53d3f5bb369ae20 (diff) | |
xub_StrLen->sal_Int32
Change-Id: I4ee33d8c5c564df62ad65cbcaf0d0cb253129fc8
Diffstat (limited to 'connectivity/source/drivers')
| -rw-r--r-- | connectivity/source/drivers/file/FStatement.cxx | 8 | ||||
| -rw-r--r-- | connectivity/source/drivers/flat/ETable.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 39a3926a9c15..02bfe247deca 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -616,7 +616,7 @@ void OStatement_Base::GetAssignValues() OSL_ENSURE(pInsertAtomCommalist->count() > 0,"OResultSet: pInsertAtomCommalist <= 0"); OSQLParseNode * pRow_Value_Const; - xub_StrLen nIndex=0; + sal_Int32 nIndex=0; for (sal_uInt32 i = 0; i < pInsertAtomCommalist->count(); i++) { pRow_Value_Const = pInsertAtomCommalist->getChild(i); // row_value_constructor @@ -626,7 +626,7 @@ void OStatement_Base::GetAssignValues() ParseAssignValues(aColumnNameList,pRow_Value_Const,nIndex++); // only one Columnname allowed per loop } else if(pRow_Value_Const->isToken()) - ParseAssignValues(aColumnNameList,pRow_Value_Const,static_cast<xub_StrLen>(i)); + ParseAssignValues(aColumnNameList,pRow_Value_Const,i); else { if(pRow_Value_Const->count() == aColumnNameList.size()) @@ -686,10 +686,10 @@ void OStatement_Base::GetAssignValues() } } // ------------------------------------------------------------------------- -void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex) +void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex) { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::ParseAssignValues" ); - OSL_ENSURE(nIndex <= aColumnNameList.size(),"SdbFileCursor::ParseAssignValues: nIndex > aColumnNameList.GetTokenCount()"); + OSL_ENSURE(size_t(nIndex) <= aColumnNameList.size(),"SdbFileCursor::ParseAssignValues: nIndex > aColumnNameList.GetTokenCount()"); OUString aColumnName(aColumnNameList[nIndex]); OSL_ENSURE(aColumnName.getLength() > 0,"OResultSet: Column-Name nicht gefunden"); OSL_ENSURE(pRow_Value_Constructor_Elem != NULL,"OResultSet: pRow_Value_Constructor_Elem darf nicht NULL sein!"); diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 6e5f148fb6d6..f30f467e2047 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -106,7 +106,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) aHeaderLine = m_aCurrentLine; } // column count - const xub_StrLen nFieldCount = aHeaderLine.GetTokenCount(m_cFieldDelimiter,m_cStringDelimiter); + const sal_Int32 nFieldCount = aHeaderLine.GetTokenCount(m_cFieldDelimiter,m_cStringDelimiter); if(!m_aColumns.is()) m_aColumns = new OSQLColumns(); @@ -239,9 +239,9 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, else { bNumeric = sal_True; - xub_StrLen nDot = 0; - xub_StrLen nDecimalDelCount = 0; - xub_StrLen nSpaceCount = 0; + sal_Int32 nDot = 0; + sal_Int32 nDecimalDelCount = 0; + sal_Int32 nSpaceCount = 0; for( sal_Int32 j = 0; j < aField2.getLength(); j++ ) { const sal_Unicode c = aField2[j]; |