diff options
Diffstat (limited to 'sc/source/filter/excel')
-rw-r--r-- | sc/source/filter/excel/tokstack.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xehelper.cxx | 16 | ||||
-rw-r--r-- | sc/source/filter/excel/xepivot.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xicontent.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/excel/xistring.cxx | 6 | ||||
-rw-r--r-- | sc/source/filter/excel/xltools.cxx | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 55034093ced2..aec31a924b42 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -685,7 +685,7 @@ const TokenId TokenPool::Store( const OUString& rString ) if (ppP_Str[ nP_StrAkt ]) { - DBG_ASSERT( sizeof( xub_StrLen ) <= 2, "*TokenPool::Store(): StrLen doesn't match!" ); + /* attention trucate to 16 bits */ pSize[ nElementAkt ] = ( sal_uInt16 ) ppP_Str[ nP_StrAkt ]->getLength(); } diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index efdc6d80c15c..b46c5fe243fe 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -388,7 +388,7 @@ XclExpStringRef lclCreateFormattedString( SvxFont aFont( XclExpFontHelper::GetFontFromItemSet( rRoot, rItemSet, nScript ) ); // Excel start position of this portion - sal_uInt16 nXclPortionStart = xString->Len(); + sal_Int32 nXclPortionStart = xString->Len(); // add portion text to Excel string XclExpStringHelper::AppendString( *xString, rRoot, aOUText.copy( nPortionPos, nPortionEnd - nPortionPos ) ); if( nXclPortionStart < xString->Len() ) @@ -446,13 +446,13 @@ XclExpStringRef lclCreateFormattedString( ESelection aSel( nPara, 0 ); OUString aParaText( rEE.GetText( nPara ) ); - std::vector<sal_uInt16> aPosList; + std::vector<sal_Int32> aPosList; rEE.GetPortions( nPara, aPosList ); // process all portions in the paragraph - for( std::vector<sal_uInt16>::const_iterator it(aPosList.begin()); it != aPosList.end(); ++it ) + for( std::vector<sal_Int32>::const_iterator it(aPosList.begin()); it != aPosList.end(); ++it ) { - aSel.nEndPos = static_cast< xub_StrLen >( *it ); + aSel.nEndPos = *it; OUString aXclPortionText = aParaText.copy( aSel.nStartPos, aSel.nEndPos - aSel.nStartPos ); aItemSet.ClearItem(); @@ -488,7 +488,7 @@ XclExpStringRef lclCreateFormattedString( } // Excel start position of this portion - sal_uInt16 nXclPortionStart = xString->Len(); + sal_Int32 nXclPortionStart = xString->Len(); // add portion text to Excel string XclExpStringHelper::AppendString( *xString, rRoot, aXclPortionText ); if( (nXclPortionStart < xString->Len()) || (aParaText.isEmpty()) ) @@ -719,12 +719,12 @@ void XclExpHFConverter::AppendPortion( const EditTextObject* pTextObj, sal_Unico ESelection aSel( nPara, 0 ); OUString aParaText; sal_Int32 nParaHeight = 0; - std::vector<sal_uInt16> aPosList; + std::vector<sal_Int32> aPosList; mrEE.GetPortions( nPara, aPosList ); - for( std::vector<sal_uInt16>::const_iterator it( aPosList.begin() ); it != aPosList.end(); ++it ) + for( std::vector<sal_Int32>::const_iterator it( aPosList.begin() ); it != aPosList.end(); ++it ) { - aSel.nEndPos = static_cast< xub_StrLen >( *it ); + aSel.nEndPos = *it; if( aSel.nStartPos < aSel.nEndPos ) { diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index f29cc2479631..e03cbf1218ce 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -471,7 +471,7 @@ void XclExpPCField::InsertOrigTextItem( const OUString& rText ) size_t nPos = 0; bool bFound = false; // #i76047# maximum item text length in pivot cache is 255 - OUString aShortText = rText.copy( 0, ::std::min( static_cast<sal_uInt16>(rText.getLength()), EXC_PC_MAXSTRLEN ) ); + OUString aShortText = rText.copy( 0, ::std::min(rText.getLength(), EXC_PC_MAXSTRLEN ) ); for( size_t nSize = maOrigItemList.GetSize(); !bFound && (nPos < nSize); ++nPos ) if( (bFound = maOrigItemList.GetRecord( nPos )->EqualsText( aShortText )) == true ) InsertItemArrayIndex( nPos ); diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 09a9c5c474a3..552dc2626427 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -933,7 +933,7 @@ void XclImpWebQuery::ReadWqtables( XclImpStream& rStrm ) const sal_Unicode cSep = ';'; OUString aQuotedPairs( "\"\"" ); - xub_StrLen nTokenCnt = ScStringUtil::GetQuotedTokenCount( aTables, aQuotedPairs, ',' ); + sal_Int32 nTokenCnt = ScStringUtil::GetQuotedTokenCount( aTables, aQuotedPairs, ',' ); maTables = ""; sal_Int32 nStringIx = 0; for( sal_Int32 nToken = 0; nToken < nTokenCnt; ++nToken ) diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index 6bb003f33d68..d44057514670 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -166,7 +166,7 @@ XclImpStringIterator::XclImpStringIterator( const XclImpString& rString ) : if( !mrFormats.empty() && (mrFormats.front().mnChar == 0) ) ++mnFormatsEnd; // find end position of the first portion - mnTextEnd = static_cast< xub_StrLen >( (mnFormatsEnd < mrFormats.size()) ? + mnTextEnd = (mnFormatsEnd < mrFormats.size() ? mrFormats[ mnFormatsEnd ].mnChar : mrText.getLength() ); } @@ -194,8 +194,8 @@ XclImpStringIterator& XclImpStringIterator::operator++() ++mnFormatsEnd; // character positions of next portion mnTextBeg = mnTextEnd; - mnTextEnd = static_cast< xub_StrLen >( (mnFormatsEnd < mrFormats.size()) ? - mrFormats[ mnFormatsEnd ].mnChar : mrText.getLength() ); + mnTextEnd = (mnFormatsEnd < mrFormats.size()) ? + mrFormats[ mnFormatsEnd ].mnChar : mrText.getLength(); } while( Is() && (mnTextBeg == mnTextEnd) ); } diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 7da57ce532b4..d12a85aa793d 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -512,7 +512,7 @@ sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName ) if( rDefName.matchIgnoreAsciiCase( aBuiltInName, nPrefixLen ) ) { // name can be followed by underline or space character - xub_StrLen nNextCharPos = nPrefixLen + nBuiltInLen; + sal_Int32 nNextCharPos = nPrefixLen + nBuiltInLen; sal_Unicode cNextChar = (rDefName.getLength() > nNextCharPos) ? rDefName[nNextCharPos] : '\0'; if( (cNextChar == '\0') || (cNextChar == ' ') || (cNextChar == '_') ) return cBuiltIn; |