summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--l10ntools/inc/cfgmerge.hxx6
-rw-r--r--l10ntools/inc/export.hxx10
-rw-r--r--l10ntools/inc/gsicheck.hxx12
-rw-r--r--l10ntools/inc/tagtest.hxx14
-rw-r--r--l10ntools/inc/xmlparse.hxx4
-rw-r--r--l10ntools/layout/layoutparse.cxx4
-rw-r--r--l10ntools/layout/tralay.cxx4
-rw-r--r--l10ntools/source/cfgmerge.cxx10
-rw-r--r--l10ntools/source/export.cxx22
-rw-r--r--l10ntools/source/export2.cxx10
-rw-r--r--l10ntools/source/gsicheck.cxx30
-rw-r--r--l10ntools/source/gsiconv.cxx8
-rw-r--r--l10ntools/source/lngmerge.cxx10
-rw-r--r--l10ntools/source/localize.cxx12
-rw-r--r--l10ntools/source/srciter.cxx2
-rw-r--r--l10ntools/source/tagtest.cxx2
-rw-r--r--l10ntools/source/xmlparse.cxx62
17 files changed, 111 insertions, 111 deletions
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index e0c2c0cf61f2..2f6418e1aa3f 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -76,13 +76,13 @@ public:
CfgStack() : CfgStackList( 10, 10 ) {}
~CfgStack();
- sal_uIntPtr Push( CfgStackData *pStackData );
+ sal_uLong Push( CfgStackData *pStackData );
CfgStackData *Push( const ByteString &rTag, const ByteString &rId );
CfgStackData *Pop() { return Remove( Count() - 1 ); }
- CfgStackData *GetStackData( sal_uIntPtr nPos = LIST_APPEND );
+ CfgStackData *GetStackData( sal_uLong nPos = LIST_APPEND );
- ByteString GetAccessPath( sal_uIntPtr nPos = LIST_APPEND );
+ ByteString GetAccessPath( sal_uLong nPos = LIST_APPEND );
};
//
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 768e63b03fd8..b315d6cb3040 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -114,11 +114,11 @@ DECLARE_LIST( ExportListBase, ExportListEntry * )
class ExportList : public ExportListBase
{
private:
- sal_uIntPtr nSourceLanguageListEntryCount;
+ sal_uLong nSourceLanguageListEntryCount;
public:
ExportList() : ExportListBase() { nSourceLanguageListEntryCount = 0; }
- sal_uIntPtr GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
+ sal_uLong GetSourceLanguageListEntryCount() { return nSourceLanguageListEntryCount; }
void NewSourceLanguageListEntry() { nSourceLanguageListEntryCount++; }
};
@@ -302,11 +302,11 @@ private:
sal_Bool bDefine; // cur. res. in a define?
sal_Bool bNextMustBeDefineEOL; // define but no \ at lineend
- sal_uIntPtr nLevel; // res. recursiv? how deep?
+ sal_uLong nLevel; // res. recursiv? how deep?
sal_uInt16 nList; // cur. res. is String- or FilterList
ByteString nListLang;
- sal_uIntPtr nListIndex;
- sal_uIntPtr nListLevel;
+ sal_uLong nListIndex;
+ sal_uLong nListLevel;
bool bSkipFile;
ByteString sProject;
ByteString sRoot;
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 49a1f861eed0..6779557a4bb6 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -41,7 +41,7 @@ private:
ParserMessageList aMessages;
LineFormat aFormat;
- sal_uIntPtr nLineNumber;
+ sal_uLong nLineNumber;
ByteString aUniqId;
ByteString aLineType;
@@ -56,9 +56,9 @@ private:
void ReassembleLine();
public:
- GSILine( const ByteString &rLine, sal_uIntPtr nLine );
+ GSILine( const ByteString &rLine, sal_uLong nLine );
LineFormat GetLineFormat() const { return aFormat; }
- sal_uIntPtr GetLineNumber() const { return nLineNumber; }
+ sal_uLong GetLineNumber() const { return nLineNumber; }
ByteString const GetUniqId() const { return aUniqId; }
ByteString const GetLineType() const { return aLineType; }
@@ -113,11 +113,11 @@ private:
public:
GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans, sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp );
~GSIBlock();
- void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uIntPtr nLine, ByteString aUniqueId = ByteString() );
- void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uIntPtr nLine, ByteString aUniqueId = ByteString() );
+ void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
+ void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
void InsertLine( GSILine* pLine, const ByteString aSourceLang);
void SetReferenceLine( GSILine* pLine );
- sal_Bool CheckSyntax( sal_uIntPtr nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags );
+ sal_Bool CheckSyntax( sal_uLong nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags );
void WriteError( LazySvFileStream &aErrOut, sal_Bool bRequireSourceLine );
void WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLine );
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index 90b19037e6e9..ef2a696d71d7 100644
--- a/l10ntools/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.hxx
@@ -235,13 +235,13 @@ public:
void Clear()
{
- for ( sal_uIntPtr i = 0 ; i < Count() ; i++ )
+ for ( sal_uLong i = 0 ; i < Count() ; i++ )
delete TokenListImpl::GetObject( i );
TokenListImpl::Clear();
}
- void Insert( TokenInfo p, sal_uIntPtr nIndex = LIST_APPEND )
+ void Insert( TokenInfo p, sal_uLong nIndex = LIST_APPEND )
{ TokenListImpl::Insert( new TokenInfo(p), nIndex ); }
-/* TokenInfo Remove( sal_uIntPtr nIndex )
+/* TokenInfo Remove( sal_uLong nIndex )
{
TokenInfo aT = GetObject( nIndex );
delete TokenListImpl::GetObject( nIndex );
@@ -250,16 +250,16 @@ public:
}*/
// TokenInfo Remove( TokenInfo p ){ return Remove( GetPos( p ) ); }
// TokenInfo GetCurObject() const { return *TokenListImpl::GetCurObject(); }
- TokenInfo& GetObject( sal_uIntPtr nIndex ) const
+ TokenInfo& GetObject( sal_uLong nIndex ) const
{
// if ( TokenListImpl::GetObject(nIndex) )
return *TokenListImpl::GetObject(nIndex);
// else
// return TokenInfo();
}
-/* sal_uIntPtr GetPos( const TokenInfo p ) const
+/* sal_uLong GetPos( const TokenInfo p ) const
{
- for ( sal_uIntPtr i = 0 ; i < Count() ; i++ )
+ for ( sal_uLong i = 0 ; i < Count() ; i++ )
if ( p == GetObject( i ) )
return i;
return LIST_ENTRY_NOTFOUND;
@@ -267,7 +267,7 @@ public:
TokenList( const TokenList& rList );
/* {
- for ( sal_uIntPtr i = 0 ; i < rList.Count() ; i++ )
+ for ( sal_uLong i = 0 ; i < rList.Count() ; i++ )
{
Insert( rList.GetObject( i ), LIST_APPEND );
}
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index cb72ca532afe..5be58ffb50a7 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -490,8 +490,8 @@ public:
*/
struct XMLError {
XML_Error eCode; // the error code
- sal_uIntPtr nLine; // error line number
- sal_uIntPtr nColumn; // error column number
+ sal_uLong nLine; // error line number
+ sal_uLong nColumn; // error column number
String sMessage; // readable error message
};
diff --git a/l10ntools/layout/layoutparse.cxx b/l10ntools/layout/layoutparse.cxx
index 692571b1166d..f24cc432bf41 100644
--- a/l10ntools/layout/layoutparse.cxx
+++ b/l10ntools/layout/layoutparse.cxx
@@ -44,7 +44,7 @@ LayoutXMLFile::SearchL10NElements( XMLParentNode* pCur, int )
/* Recurse int children, SearchL10NElements does not do that for us. */
if ( XMLChildNodeList* lst = pCur->GetChildList() )
- for ( sal_uIntPtr i = 0; i < lst->Count(); i++ )
+ for ( sal_uLong i = 0; i < lst->Count(); i++ )
if ( lst->GetObject( i )->GetNodeType() == XML_NODE_TYPE_ELEMENT )
HandleElement( ( XMLElement* )lst->GetObject( i ) );
else if ( lst->GetObject( i )->GetNodeType() == XML_NODE_TYPE_COMMENT )
@@ -56,7 +56,7 @@ interestingAttributes( XMLAttributeList* lst )
{
std::vector<XMLAttribute*> interesting;
if ( lst )
- for ( sal_uIntPtr i = 0; i < lst->Count(); i++ )
+ for ( sal_uLong i = 0; i < lst->Count(); i++ )
if ( lst->GetObject( i )->Equals( STRING( "id" ) ) )
interesting.insert( interesting.begin(), lst->GetObject( i ) );
else if ( ! BSTRING( *lst->GetObject( i ) ).CompareTo( "_", 1 ) )
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index 906173998b1c..9e6fa32bb094 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -163,7 +163,7 @@ void TranslateLayout::ParseCommandLine()
static XMLAttribute*
findAttribute( XMLAttributeList* lst, String const& name )
{
- for ( sal_uIntPtr i = 0; i < lst->Count(); i++ )
+ for ( sal_uLong i = 0; i < lst->Count(); i++ )
if ( lst->GetObject( i )->Equals( name ) )
return lst->GetObject( i );
return 0;
@@ -243,7 +243,7 @@ static void insertMarker( XMLParentNode *p, ByteString const& file )
if ( XMLChildNodeList* lst = p->GetChildList() )
if ( lst->Count() )
{
- sal_uIntPtr i = 1;
+ sal_uLong i = 1;
// Skip newline, if possible.
if ( lst->Count() > 1
&& lst->GetObject( 2 )->GetNodeType() == XML_NODE_TYPE_DEFAULT )
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 6b161ea9be8f..ab53f28a1092 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -309,19 +309,19 @@ CfgStackData* CfgStack::Push( const ByteString &rTag, const ByteString &rId )
CfgStack::~CfgStack()
/*****************************************************************************/
{
- for ( sal_uIntPtr i = 0; i < Count(); i++ )
+ for ( sal_uLong i = 0; i < Count(); i++ )
delete GetObject( i );
}
/*****************************************************************************/
-ByteString CfgStack::GetAccessPath( sal_uIntPtr nPos )
+ByteString CfgStack::GetAccessPath( sal_uLong nPos )
/*****************************************************************************/
{
if ( nPos == LIST_APPEND )
nPos = Count() - 1;
ByteString sReturn;
- for ( sal_uIntPtr i = 0; i <= nPos; i++ ) {
+ for ( sal_uLong i = 0; i <= nPos; i++ ) {
if ( i )
sReturn += ".";
sReturn += GetStackData( i )->GetIdentifier();
@@ -331,7 +331,7 @@ ByteString CfgStack::GetAccessPath( sal_uIntPtr nPos )
}
/*****************************************************************************/
-CfgStackData *CfgStack::GetStackData( sal_uIntPtr nPos )
+CfgStackData *CfgStack::GetStackData( sal_uLong nPos )
/*****************************************************************************/
{
if ( nPos == LIST_APPEND )
@@ -805,7 +805,7 @@ void CfgMerge::Output( const ByteString& rOutput )
pOutputStream->Write( rOutput.GetBuffer(), rOutput.Len());
}
-sal_uIntPtr CfgStack::Push( CfgStackData *pStackData )
+sal_uLong CfgStack::Push( CfgStackData *pStackData )
{
Insert( pStackData, LIST_APPEND );
return Count() - 1;
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 7d145f768f99..1012e19b6064 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -238,8 +238,8 @@ extern FILE *GetNextFile()
ByteString sOrigFile( sFileName );
sFileName = Export::GetNativeFile( sFileName );
- delete aInputFileList.GetObject(( sal_uIntPtr ) 0 );
- aInputFileList.Remove(( sal_uIntPtr ) 0 );
+ delete aInputFileList.GetObject(( sal_uLong ) 0 );
+ aInputFileList.Remove(( sal_uLong ) 0 );
if ( sFileName == "" ) {
fprintf( stderr, "ERROR: Could not precompile File %s\n",
@@ -504,8 +504,8 @@ void Export::Init()
nListLang = ByteString( String::CreateFromAscii(""),RTL_TEXTENCODING_ASCII_US );
nListIndex = 0;
while ( aResStack.Count()) {
- delete aResStack.GetObject(( sal_uIntPtr ) 0 );
- aResStack.Remove(( sal_uIntPtr ) 0 );
+ delete aResStack.GetObject(( sal_uLong ) 0 );
+ aResStack.Remove(( sal_uLong ) 0 );
}
}
@@ -519,8 +519,8 @@ Export::~Export()
if ( bEnableExport )
aOutput.Close();
while ( aResStack.Count()) {
- delete aResStack.GetObject(( sal_uIntPtr ) 0 );
- aResStack.Remove(( sal_uIntPtr ) 0 );
+ delete aResStack.GetObject(( sal_uLong ) 0 );
+ aResStack.Remove(( sal_uLong ) 0 );
}
if ( bMergeMode && !bUnmerge ) {
@@ -1492,7 +1492,7 @@ sal_Bool Export::WriteExportList( ResData *pResData, ExportList *pExportList,
ByteString sTimeStamp( Export::GetTimeStamp());
ByteString sCur;
- for ( sal_uIntPtr i = 0; pExportList != NULL && i < pExportList->Count(); i++ ) {
+ for ( sal_uLong i = 0; pExportList != NULL && i < pExportList->Count(); i++ ) {
ExportListEntry *pEntry = pExportList->GetObject( i );
// mandatory for export: german and eng. and/or enus
//ByteString a("Export::WriteExportList::pEntry");
@@ -2322,8 +2322,8 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
pResData->sId = ByteString("1");
PFormEntrys *pEntrys;
- sal_uIntPtr nLIndex = 0;
- sal_uIntPtr nMaxIndex = 0;
+ sal_uLong nLIndex = 0;
+ sal_uLong nMaxIndex = 0;
if ( pList )
nMaxIndex = pList->GetSourceLanguageListEntryCount();
pEntrys = pMergeDataFile->GetPFormEntrys( pResData );
@@ -2480,7 +2480,7 @@ void Export::MergeRest( ResData *pResData, sal_uInt16 nMode )
}
nListIndex++;
- sal_uIntPtr nMaxIndex = 0;
+ sal_uLong nMaxIndex = 0;
if ( pList )
nMaxIndex = pList->GetSourceLanguageListEntryCount();
ByteString sLine;
@@ -2535,7 +2535,7 @@ void Export::SetChildWithText()
/*****************************************************************************/
{
if ( aResStack.Count() > 1 ) {
- for ( sal_uIntPtr i = 0; i < aResStack.Count() - 1; i++ ) {
+ for ( sal_uLong i = 0; i < aResStack.Count() - 1; i++ ) {
aResStack.GetObject( i )->bChildWithText = sal_True;
}
}
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index e09ed0eff1b2..eb5f8d5fbf15 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -52,7 +52,7 @@ ResData::~ResData()
{
if ( pStringList ) {
// delete existing res. of type StringList
- for ( sal_uIntPtr i = 0; i < pStringList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pStringList->Count(); i++ ) {
ExportListEntry* test = pStringList->GetObject( i );
if( test != NULL ) delete test;
}
@@ -60,7 +60,7 @@ ResData::~ResData()
}
if ( pFilterList ) {
// delete existing res. of type FilterList
- for ( sal_uIntPtr i = 0; i < pFilterList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pFilterList->Count(); i++ ) {
ExportListEntry* test = pFilterList->GetObject( i );
delete test;
}
@@ -68,7 +68,7 @@ ResData::~ResData()
}
if ( pItemList ) {
// delete existing res. of type ItemList
- for ( sal_uIntPtr i = 0; i < pItemList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pItemList->Count(); i++ ) {
ExportListEntry* test = pItemList->GetObject( i );
delete test;
}
@@ -76,7 +76,7 @@ ResData::~ResData()
}
if ( pUIEntries ) {
// delete existing res. of type UIEntries
- for ( sal_uIntPtr i = 0; i < pUIEntries->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pUIEntries->Count(); i++ ) {
ExportListEntry* test = pUIEntries->GetObject( i );
delete test;
}
@@ -558,7 +558,7 @@ void Export::FillInListFallbacks(
/*****************************************************************************/
{
- for ( sal_uIntPtr i = 0; i < pList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pList->Count(); i++ ) {
ExportListEntry *pEntry = pList->GetObject( i );
if ( !( *pEntry )[ nSource ].Len()){
( *pEntry )[ nSource ] = ( *pEntry )[ nFallback ];
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 67e736377c80..61c7cf02fea3 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -40,7 +40,7 @@
/*****************************************************************************/
void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix,
- ByteString aContext, sal_Bool bPrintContext, sal_uIntPtr nLine, ByteString aUniqueId = ByteString() )
+ ByteString aContext, sal_Bool bPrintContext, sal_uLong nLine, ByteString aUniqueId = ByteString() )
/*****************************************************************************/
{
fprintf( stdout, "%s %s, Line %lu", aType.GetBuffer(), aPrefix.GetBuffer(), nLine );
@@ -55,7 +55,7 @@ void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix,
/*****************************************************************************/
void PrintError( ByteString aMsg, ByteString aPrefix,
- ByteString aContext, sal_Bool bPrintContext, sal_uIntPtr nLine, ByteString aUniqueId = ByteString() )
+ ByteString aContext, sal_Bool bPrintContext, sal_uLong nLine, ByteString aUniqueId = ByteString() )
/*****************************************************************************/
{
PrintMessage( "Error:", aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId );
@@ -133,7 +133,7 @@ void LazySvFileStream::LazyOpen()
//
/*****************************************************************************/
-GSILine::GSILine( const ByteString &rLine, sal_uIntPtr nLine )
+GSILine::GSILine( const ByteString &rLine, sal_uLong nLine )
/*****************************************************************************/
: ByteString( rLine )
, nLineNumber( nLine )
@@ -305,7 +305,7 @@ GSIBlock::~GSIBlock()
delete pSourceLine;
delete pReferenceLine;
- for ( sal_uIntPtr i = 0; i < Count(); i++ )
+ for ( sal_uLong i = 0; i < Count(); i++ )
delete ( GetObject( i ));
}
@@ -328,7 +328,7 @@ void GSIBlock::InsertLine( GSILine* pLine, ByteString aSourceLang)
return;
}
}
- sal_uIntPtr nPos = 0;
+ sal_uLong nPos = 0;
if ( aSourceLang.Len() ) // only check blockstructure if source lang is given
{
@@ -356,7 +356,7 @@ void GSIBlock::SetReferenceLine( GSILine* pLine )
/*****************************************************************************/
void GSIBlock::PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix,
- ByteString aContext, sal_uIntPtr nLine, ByteString aUniqueId )
+ ByteString aContext, sal_uLong nLine, ByteString aUniqueId )
/*****************************************************************************/
{
::PrintMessage( aType, aMsg, aPrefix, aContext, bPrintContext, nLine, aUniqueId );
@@ -364,7 +364,7 @@ void GSIBlock::PrintMessage( ByteString aType, ByteString aMsg, ByteString aPref
/*****************************************************************************/
void GSIBlock::PrintError( ByteString aMsg, ByteString aPrefix,
- ByteString aContext, sal_uIntPtr nLine, ByteString aUniqueId )
+ ByteString aContext, sal_uLong nLine, ByteString aUniqueId )
/*****************************************************************************/
{
PrintMessage( "Error:", aMsg, aPrefix, aContext, nLine, aUniqueId );
@@ -375,7 +375,7 @@ void GSIBlock::PrintList( ParserMessageList *pList, ByteString aPrefix,
GSILine *pLine )
/*****************************************************************************/
{
- sal_uIntPtr i;
+ sal_uLong i;
for ( i = 0 ; i < pList->Count() ; i++ )
{
ParserMessage *pMsg = pList->GetObject( i );
@@ -580,7 +580,7 @@ sal_Bool GSIBlock::HasSuspiciousChars( GSILine* pTestee, GSILine* pSource )
/*****************************************************************************/
-sal_Bool GSIBlock::CheckSyntax( sal_uIntPtr nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags )
+sal_Bool GSIBlock::CheckSyntax( sal_uLong nLine, sal_Bool bRequireSourceLine, sal_Bool bFixTags )
/*****************************************************************************/
{
static LingTest aTester;
@@ -636,7 +636,7 @@ sal_Bool GSIBlock::CheckSyntax( sal_uIntPtr nLine, sal_Bool bRequireSourceLine,
if ( pSourceLine )
bHasError |= !TestUTF8( pSourceLine, bFixTags );
- sal_uIntPtr i;
+ sal_uLong i;
for ( i = 0; i < Count(); i++ )
{
aTester.CheckTestee( GetObject( i ), pSourceLine != NULL, bFixTags );
@@ -663,7 +663,7 @@ void GSIBlock::WriteError( LazySvFileStream &aErrOut, sal_Bool bRequireSourceLin
sal_Bool bHasError = sal_False;
sal_Bool bCopyAll = ( !pSourceLine && bRequireSourceLine ) || ( pSourceLine && !pSourceLine->IsOK() && !bCheckTranslationLang ) || bHasBlockError;
- sal_uIntPtr i;
+ sal_uLong i;
for ( i = 0; i < Count(); i++ )
{
if ( !GetObject( i )->IsOK() || bCopyAll )
@@ -687,7 +687,7 @@ void GSIBlock::WriteCorrect( LazySvFileStream &aOkOut, sal_Bool bRequireSourceLi
return;
sal_Bool bHasOK = sal_False;
- sal_uIntPtr i;
+ sal_uLong i;
for ( i = 0; i < Count(); i++ )
{
if ( ( GetObject( i )->IsOK() || bCheckSourceLang ) && !bHasBlockError )
@@ -711,7 +711,7 @@ void GSIBlock::WriteFixed( LazySvFileStream &aFixOut, sal_Bool /*bRequireSourceL
return;
sal_Bool bHasFixes = sal_False;
- sal_uIntPtr i;
+ sal_uLong i;
for ( i = 0; i < Count(); i++ )
{
if ( GetObject( i )->IsFixed() )
@@ -1033,13 +1033,13 @@ int _cdecl main( int argc, char *argv[] )
ByteString sReferenceLine;
GSILine* pReferenceLine = NULL;
ByteString aOldReferenceId("No Valid ID"); // just set to something which can never be an ID
- sal_uIntPtr nReferenceLine = 0;
+ sal_uLong nReferenceLine = 0;
ByteString sGSILine;
GSILine* pGSILine = NULL;
ByteString aOldId("No Valid ID"); // just set to something which can never be an ID
GSIBlock *pBlock = NULL;
- sal_uIntPtr nLine = 0;
+ sal_uLong nLine = 0;
while ( !aGSI.IsEof() )
{
diff --git a/l10ntools/source/gsiconv.cxx b/l10ntools/source/gsiconv.cxx
index 64ec6e38af5b..5e332ac945a0 100644
--- a/l10ntools/source/gsiconv.cxx
+++ b/l10ntools/source/gsiconv.cxx
@@ -44,7 +44,7 @@ sal_uInt16 GetGSIFileType( SvStream &rStream )
{
sal_uInt16 nFileType = GSI_FILE_UNKNOWN;
- sal_uIntPtr nPos( rStream.Tell());
+ sal_uLong nPos( rStream.Tell());
rStream.Seek( STREAM_SEEK_TO_BEGIN );
ByteString sLine;
@@ -233,7 +233,7 @@ int _cdecl main( int argc, char *argv[] )
sal_uInt16 nFileType( GetGSIFileType( aGSI ));
- sal_uIntPtr nMaxLines = (sal_uIntPtr) ByteString( argv[ 2 ] ).ToInt64();
+ sal_uLong nMaxLines = (sal_uLong) ByteString( argv[ 2 ] ).ToInt64();
if ( !nMaxLines ) {
fprintf( stderr, "\nERROR: Linecount must be at least 1!\n\n" );
exit ( 3 );
@@ -241,8 +241,8 @@ int _cdecl main( int argc, char *argv[] )
ByteString sGSILine;
ByteString sOldId;
- sal_uIntPtr nLine = 0;
- sal_uIntPtr nOutputFile = 1;
+ sal_uLong nLine = 0;
+ sal_uLong nOutputFile = 1;
String sOutput( sBase );
sOutput += String( "_", RTL_TEXTENCODING_ASCII_US );
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index bf105426bac1..f63469cff75b 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -76,7 +76,7 @@ LngParser::LngParser( const ByteString &rLngFile, sal_Bool bUTF8, sal_Bool bULFF
LngParser::~LngParser()
/*****************************************************************************/
{
- for ( sal_uIntPtr i = 0; i < pLines->Count(); i++ )
+ for ( sal_uLong i = 0; i < pLines->Count(); i++ )
delete pLines->GetObject( i );
delete pLines;
}
@@ -124,7 +124,7 @@ sal_Bool LngParser::CreateSDF(
sFullEntry.Copy( sPrjEntry.Len() + 1 ), gsl_getSystemTextEncoding());
sActFileName.SearchAndReplaceAll( "/", "\\" );
- sal_uIntPtr nPos = 0;
+ sal_uLong nPos = 0;
sal_Bool bStart = true;
ByteString sGroup;
ByteStringHashMap Text;
@@ -225,7 +225,7 @@ sal_Bool LngParser::Merge(
Export::SetLanguages( aMergeDataFile.GetLanguages() );
aLanguages = Export::GetLanguages();
- sal_uIntPtr nPos = 0;
+ sal_uLong nPos = 0;
sal_Bool bGroup = sal_False;
ByteString sGroup;
@@ -248,7 +248,7 @@ sal_Bool LngParser::Merge(
while ( nPos < pLines->Count()) {
ByteStringHashMap Text;
ByteString sID( sGroup );
- sal_uIntPtr nLastLangPos = 0;
+ sal_uLong nLastLangPos = 0;
ResData *pResData = new ResData( "", sID , sSource );
pResData->sResTyp = "LngText";
@@ -348,7 +348,7 @@ sal_Bool LngParser::Merge(
delete pResData;
}
- for ( sal_uIntPtr i = 0; i < pLines->Count(); i++ )
+ for ( sal_uLong i = 0; i < pLines->Count(); i++ )
aDestination.WriteLine( *pLines->GetObject( i ));
aDestination.Close();
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 0f87f44bfd39..276048659e3f 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -242,10 +242,10 @@ const ByteString SourceTreeLocalizer::GetProjectRootRel()
sCur.SearchAndReplaceAll( sDelimiter, "/" );
sCur.EraseLeadingChars( '/' );
- sal_uIntPtr nCount = sCur.GetTokenCount( '/' );
+ sal_uLong nCount = sCur.GetTokenCount( '/' );
ByteString sProjectRootRel;
- for ( sal_uIntPtr i = 0; i < nCount; i++ ) {
+ for ( sal_uLong i = 0; i < nCount; i++ ) {
if ( sProjectRootRel.Len())
sProjectRootRel += sDelimiter;
sProjectRootRel += "..";
@@ -361,7 +361,7 @@ ByteString SourceTreeLocalizer::getSourceLanguages( ByteString sLanguageRestrict
sal_Bool SourceTreeLocalizer::CheckNegativeList( const ByteString &rFileName )
/*****************************************************************************/
{
- sal_uIntPtr nIndex = 0;
+ sal_uLong nIndex = 0;
sal_Bool bReturn = sal_True;
ByteString sDelimiter(
@@ -390,7 +390,7 @@ sal_Bool SourceTreeLocalizer::CheckNegativeList( const ByteString &rFileName )
sal_Bool SourceTreeLocalizer::CheckPositiveList( const ByteString &rFileName )
/*****************************************************************************/
{
- sal_uIntPtr nIndex = 0;
+ sal_uLong nIndex = 0;
sal_Bool bReturn = sal_False;
ByteString sDelimiter(
@@ -452,7 +452,7 @@ void SourceTreeLocalizer::WorkOnDirectory( const ByteString &rDirectory )
/*****************************************************************************/
{
//printf("Working on Directory %s\n",rDirectory.GetBuffer());
- sal_uIntPtr nIndex = 0;
+ sal_uLong nIndex = 0;
ByteString sExtension( ExeTable[ nIndex ][ 0 ] );
ByteString sExecutable( ExeTable[ nIndex ][ 1 ] );
ByteString sParameter( ExeTable[ nIndex ][ 2 ] );
@@ -536,7 +536,7 @@ sal_Bool SourceTreeLocalizer::MergeSingleFile(
ByteString sBCur( aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
- sal_uIntPtr nIndex = 0;
+ sal_uLong nIndex = 0;
ByteString sExtension( aEntry.GetExtension(), RTL_TEXTENCODING_ASCII_US );
ByteString sCandidate( ExeTable[ nIndex ][ 0 ] );
diff --git a/l10ntools/source/srciter.cxx b/l10ntools/source/srciter.cxx
index 4e87fda3e079..0c5071fca053 100644
--- a/l10ntools/source/srciter.cxx
+++ b/l10ntools/source/srciter.cxx
@@ -103,7 +103,7 @@ void SourceTreeIterator::ExecuteDirectory( transex::Directory& aDirectory )
aDirectory.readDirectory();
OnExecuteDirectory( aDirectory.getFullName() );
if ( aDirectory.getSubDirectories().size() )
- for ( sal_uIntPtr i=0;i < aDirectory.getSubDirectories().size();i++ )
+ for ( sal_uLong i=0;i < aDirectory.getSubDirectories().size();i++ )
ExecuteDirectory( aDirectory.getSubDirectories()[ i ] );
}
}
diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index 13d474e2d59c..f60785343c91 100644
--- a/l10ntools/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.cxx
@@ -1421,7 +1421,7 @@ sal_Bool LingTest::IsTagMandatory( TokenInfo const &aToken, TokenId &aMetaTokens
void LingTest::CheckTags( TokenList &aReference, TokenList &aTestee, sal_Bool bFixTags )
{
- sal_uIntPtr i=0,j=0;
+ sal_uLong i=0,j=0;
// Clean old Warnings
while ( aCompareWarningList.Count() )
{
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index a92eed15c9fa..06e86e0358e4 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -96,7 +96,7 @@ XMLParentNode::XMLParentNode( const XMLParentNode& obj)
if( obj.pChildList ){
pChildList=new XMLChildNodeList();
XMLChildNode* pNode = NULL;
- for ( sal_uIntPtr i = 0; i < obj.pChildList->Count(); i++ ){
+ for ( sal_uLong i = 0; i < obj.pChildList->Count(); i++ ){
pNode = obj.pChildList->GetObject( i );
if( pNode != NULL){
switch(pNode->GetNodeType()){
@@ -126,7 +126,7 @@ XMLParentNode& XMLParentNode::operator=(const XMLParentNode& obj){
}
if( obj.pChildList ){
pChildList=new XMLChildNodeList();
- for ( sal_uIntPtr i = 0; i < obj.pChildList->Count(); i++ )
+ for ( sal_uLong i = 0; i < obj.pChildList->Count(); i++ )
AddChild( obj.pChildList->GetObject( i ) );
}else pChildList = NULL;
@@ -160,7 +160,7 @@ int XMLParentNode::GetPosition( ByteString id ){
static const ByteString sDeStr = ByteString(String::CreateFromAscii(GERMAN_ISO2).ToLowerAscii() , RTL_TEXTENCODING_ASCII_US ).ToLowerAscii();
if ( pChildList ){
- for ( sal_uIntPtr i = 0; i < pChildList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pChildList->Count(); i++ ) {
XMLChildNode *pChild = pChildList->GetObject( i );
if ( pChild->GetNodeType() == XML_NODE_TYPE_ELEMENT ){
a = static_cast<XMLElement* >(pChild);
@@ -188,7 +188,7 @@ int XMLParentNode::RemoveChild( XMLElement *pRefElement )
{
XMLElement* a;
if ( pChildList ){
- for ( sal_uIntPtr i = 0; i < pChildList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pChildList->Count(); i++ ) {
XMLChildNode *pChild = pChildList->GetObject( i );
if ( pChild->GetNodeType() == XML_NODE_TYPE_ELEMENT ){
a = static_cast<XMLElement* >(pChild);
@@ -218,7 +218,7 @@ int XMLParentNode::RemoveChild( XMLElement *pRefElement )
void XMLParentNode::RemoveAndDeleteAllChilds(){
/*****************************************************************************/
if ( pChildList ) {
- for ( sal_uIntPtr i = 0; i < pChildList->Count(); i++ )
+ for ( sal_uLong i = 0; i < pChildList->Count(); i++ )
delete pChildList->GetObject( i );
pChildList->Clear();
}
@@ -228,7 +228,7 @@ void XMLParentNode::RemoveAndDeleteAllChilds(){
XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
/*****************************************************************************/
{
- for ( sal_uIntPtr i = 0; i < pChildList->Count(); i++ ) {
+ for ( sal_uLong i = 0; i < pChildList->Count(); i++ ) {
XMLChildNode *pChild = pChildList->GetObject( i );
if ( pChild->GetNodeType() == XML_NODE_TYPE_ELEMENT )
if ((( XMLElement * ) pChild )->GetName() ==
@@ -239,7 +239,7 @@ XMLElement *XMLParentNode::GetChildElement( XMLElement *pRefElement )
return ( XMLElement * ) pChild;
sal_Bool bMatch = sal_False;
- for ( sal_uIntPtr j = 0; j < pList->Count() && bMatch; j++ ) {
+ for ( sal_uLong j = 0; j < pList->Count() && bMatch; j++ ) {
XMLAttribute *pAttribute = pList->GetObject( j );
XMLAttribute *pCandidate =
(( XMLElement * ) pChild )->GetAttribute(
@@ -334,7 +334,7 @@ sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
switch( pCur->GetNodeType()) {
case XML_NODE_TYPE_FILE: {
if( GetChildList())
- for ( sal_uIntPtr i = 0; i < GetChildList()->Count(); i++ )
+ for ( sal_uLong i = 0; i < GetChildList()->Count(); i++ )
Write( rStream, GetChildList()->GetObject( i ));
}
break;
@@ -343,7 +343,7 @@ sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
rStream << "<";
WriteString( rStream, pElement->GetName());
if ( pElement->GetAttributeList())
- for ( sal_uIntPtr j = 0; j < pElement->GetAttributeList()->Count(); j++ ) {
+ for ( sal_uLong j = 0; j < pElement->GetAttributeList()->Count(); j++ ) {
rStream << " ";
String sData(*pElement->GetAttributeList()->GetObject( j ));
xmlutil.QuotHTML( sData );
@@ -358,7 +358,7 @@ sal_Bool XMLFile::Write( ofstream &rStream , XMLNode *pCur )
rStream << "/>";
else {
rStream << ">";
- for ( sal_uIntPtr k = 0; k < pElement->GetChildList()->Count(); k++ )
+ for ( sal_uLong k = 0; k < pElement->GetChildList()->Count(); k++ )
Write( rStream, pElement->GetChildList()->GetObject( k ));
rStream << "</";
WriteString( rStream, pElement->GetName());
@@ -400,7 +400,7 @@ void XMLFile::Print( XMLNode *pCur, sal_uInt16 nLevel )
switch( pCur->GetNodeType()) {
case XML_NODE_TYPE_FILE: {
if( GetChildList())
- for ( sal_uIntPtr i = 0; i < GetChildList()->Count(); i++ )
+ for ( sal_uLong i = 0; i < GetChildList()->Count(); i++ )
Print( GetChildList()->GetObject( i ));
}
break;
@@ -409,7 +409,7 @@ void XMLFile::Print( XMLNode *pCur, sal_uInt16 nLevel )
fprintf( stdout, "<%s", ByteString( pElement->GetName(), RTL_TEXTENCODING_UTF8 ).GetBuffer());
if ( pElement->GetAttributeList())
- for ( sal_uIntPtr j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
+ for ( sal_uLong j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
ByteString aAttrName( *pElement->GetAttributeList()->GetObject( j ), RTL_TEXTENCODING_UTF8 );
if( !aAttrName.EqualsIgnoreCaseAscii( XML_LANG ) ) {
fprintf( stdout, " %s=\"%s\"",
@@ -422,7 +422,7 @@ void XMLFile::Print( XMLNode *pCur, sal_uInt16 nLevel )
fprintf( stdout, "/>" );
else {
fprintf( stdout, ">" );
- for ( sal_uIntPtr k = 0; k < pElement->GetChildList()->Count(); k++ )
+ for ( sal_uLong k = 0; k < pElement->GetChildList()->Count(); k++ )
Print( pElement->GetChildList()->GetObject( k ), nLevel + 1 );
fprintf( stdout, "</%s>", ByteString( pElement->GetName(), RTL_TEXTENCODING_UTF8 ).GetBuffer());
}
@@ -517,7 +517,7 @@ void XMLFile::InsertL10NElement( XMLElement* pElement ){
LangHashMap* elem;
if( pElement->GetAttributeList() != NULL ){
- for ( sal_uIntPtr j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
+ for ( sal_uLong j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
tmpStr=ByteString( *pElement->GetAttributeList()->GetObject( j ),RTL_TEXTENCODING_UTF8 );
if( tmpStr.CompareTo(ID)==COMPARE_EQUAL ){ // Get the "id" Attribute
id = ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
@@ -633,7 +633,7 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
case XML_NODE_TYPE_FILE: {
XMLParentNode* pElement;
if( GetChildList()){
- for ( sal_uIntPtr i = 0; i < GetChildList()->Count(); i++ ){
+ for ( sal_uLong i = 0; i < GetChildList()->Count(); i++ ){
pElement = (XMLParentNode*) GetChildList()->GetObject( i );
if( pElement->GetNodeType() == XML_NODE_TYPE_ELEMENT ) SearchL10NElements( pElement , i);
}
@@ -645,7 +645,7 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
ByteString sName(pElement->GetName(),RTL_TEXTENCODING_ASCII_US);
ByteString language,tmpStrVal,oldref;
if ( pElement->GetAttributeList()){
- for ( sal_uIntPtr j = 0 , cnt = pElement->GetAttributeList()->Count(); j < cnt && bInsert; j++ ){
+ for ( sal_uLong j = 0 , cnt = pElement->GetAttributeList()->Count(); j < cnt && bInsert; j++ ){
const ByteString tmpStr( *pElement->GetAttributeList()->GetObject( j ),RTL_TEXTENCODING_UTF8 );
if( tmpStr.CompareTo(THEID)==COMPARE_EQUAL ){ // Get the "id" Attribute
tmpStrVal=ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
@@ -670,7 +670,7 @@ void XMLFile::SearchL10NElements( XMLParentNode *pCur , int pos)
if ( bInsert && ( nodes_localize.find( sName.ToLowerAscii() ) != nodes_localize.end() ) )
InsertL10NElement(pElement);
else if ( bInsert && pElement->GetChildList() ){
- for ( sal_uIntPtr k = 0; k < pElement->GetChildList()->Count(); k++ )
+ for ( sal_uLong k = 0; k < pElement->GetChildList()->Count(); k++ )
SearchL10NElements( (XMLParentNode*) pElement->GetChildList()->GetObject( k ) , k);
}
}
@@ -707,7 +707,7 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
case XML_NODE_TYPE_FILE: {
XMLParentNode* pElement;
if( GetChildList()){
- for ( sal_uIntPtr i = 0; i < GetChildList()->Count(); i++ ){
+ for ( sal_uLong i = 0; i < GetChildList()->Count(); i++ ){
pElement = (XMLParentNode*) GetChildList()->GetObject( i );
if( pElement->GetNodeType() == XML_NODE_TYPE_ELEMENT ) CheckExportStatus( pElement );//, i);
}
@@ -719,7 +719,7 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
ByteString sName(pElement->GetName(),RTL_TEXTENCODING_ASCII_US);
if( sName.EqualsIgnoreCaseAscii( TOPIC ) ){
if ( pElement->GetAttributeList()){
- for ( sal_uIntPtr j = 0 , cnt = pElement->GetAttributeList()->Count(); j < cnt && bInsert; j++ ){
+ for ( sal_uLong j = 0 , cnt = pElement->GetAttributeList()->Count(); j < cnt && bInsert; j++ ){
const ByteString tmpStr( *pElement->GetAttributeList()->GetObject( j ),RTL_TEXTENCODING_UTF8 );
if( tmpStr.EqualsIgnoreCaseAscii( STATUS ) ){
ByteString tmpStrVal=ByteString( pElement->GetAttributeList()->GetObject( j )->GetValue(),RTL_TEXTENCODING_UTF8 );
@@ -733,7 +733,7 @@ bool XMLFile::CheckExportStatus( XMLParentNode *pCur )
}
}
else if ( pElement->GetChildList() ){
- for ( sal_uIntPtr k = 0; k < pElement->GetChildList()->Count(); k++ )
+ for ( sal_uLong k = 0; k < pElement->GetChildList()->Count(); k++ )
CheckExportStatus( (XMLParentNode*) pElement->GetChildList()->GetObject( k ) );//, k);
}
}
@@ -768,7 +768,7 @@ XMLElement::XMLElement(const XMLElement& obj)
{
if ( obj.pAttributes ){
pAttributes = new XMLAttributeList();
- for ( sal_uIntPtr i = 0; i < obj.pAttributes->Count(); i++ )
+ for ( sal_uLong i = 0; i < obj.pAttributes->Count(); i++ )
AddAttribute( *obj.pAttributes->GetObject( i ) , obj.pAttributes->GetObject( i )->GetValue() );
}
}
@@ -788,13 +788,13 @@ XMLElement& XMLElement::operator=(const XMLElement& obj){
nPos =obj.nPos;
if ( pAttributes ){
- for ( sal_uIntPtr i = 0; i < pAttributes->Count(); i++ )
+ for ( sal_uLong i = 0; i < pAttributes->Count(); i++ )
delete pAttributes->GetObject( i );
delete pAttributes;
}
if ( obj.pAttributes ){
pAttributes =new XMLAttributeList();
- for ( sal_uIntPtr i = 0; i < obj.pAttributes->Count(); i++ )
+ for ( sal_uLong i = 0; i < obj.pAttributes->Count(); i++ )
AddAttribute( *obj.pAttributes->GetObject( i ) , obj.pAttributes->GetObject( i )->GetValue() );
}
}
@@ -816,7 +816,7 @@ void XMLElement::ChangeLanguageTag( const String &rValue ){
static const String rName = String::CreateFromAscii("xml-lang");
SetLanguageId( ByteString(rValue,RTL_TEXTENCODING_UTF8) );
if ( pAttributes ){
- for ( sal_uIntPtr i = 0; i < pAttributes->Count(); i++ ){
+ for ( sal_uLong i = 0; i < pAttributes->Count(); i++ ){
if ( *pAttributes->GetObject( i ) == rName ){
pAttributes->GetObject( i )->setValue(rValue);
}
@@ -827,7 +827,7 @@ void XMLElement::ChangeLanguageTag( const String &rValue ){
XMLChildNodeList* pCList = GetChildList();
if( pCList != NULL ){
- for ( sal_uIntPtr i = 0; i < pCList->Count(); i++ ){
+ for ( sal_uLong i = 0; i < pCList->Count(); i++ ){
pNode = pCList->GetObject( i );
if( pNode != NULL && pNode->GetNodeType() == XML_NODE_TYPE_ELEMENT ){
pElem = static_cast< XMLElement* >(pNode);
@@ -845,7 +845,7 @@ XMLAttribute *XMLElement::GetAttribute( const String &rName )
/*****************************************************************************/
{
if ( pAttributes )
- for ( sal_uIntPtr i = 0; i < pAttributes->Count(); i++ )
+ for ( sal_uLong i = 0; i < pAttributes->Count(); i++ )
if ( *pAttributes->GetObject( i ) == rName )
return pAttributes->GetObject( i );
@@ -857,7 +857,7 @@ XMLElement::~XMLElement()
/*****************************************************************************/
{
if ( pAttributes ) {
- for ( sal_uIntPtr i = 0; i < pAttributes->Count(); i++ )
+ for ( sal_uLong i = 0; i < pAttributes->Count(); i++ )
delete pAttributes->GetObject( i );
delete pAttributes;
@@ -906,7 +906,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
if ( pElement->GetAttributeList()){
if ( pElement->GetChildList()){
XMLChildNode* tmp=NULL;
- for ( sal_uIntPtr k = 0; k < pElement->GetChildList()->Count(); k++ ){
+ for ( sal_uLong k = 0; k < pElement->GetChildList()->Count(); k++ ){
tmp=pElement->GetChildList()->GetObject( k );
Print( tmp, buffer , false);
}
@@ -923,7 +923,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
buffer.append( OUString::createFromAscii("\\<") );
buffer.append( pElement->GetName() );
if ( pElement->GetAttributeList()){
- for ( sal_uIntPtr j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
+ for ( sal_uLong j = 0; j < pElement->GetAttributeList()->Count(); j++ ){
OUString aAttrName( *pElement->GetAttributeList()->GetObject( j ) );
if( !aAttrName.equalsIgnoreAsciiCase( XML_LANG ) ) {
@@ -941,7 +941,7 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
else {
buffer.append( OUString::createFromAscii("\\>") );
XMLChildNode* tmp=NULL;
- for ( sal_uIntPtr k = 0; k < pElement->GetChildList()->Count(); k++ ){
+ for ( sal_uLong k = 0; k < pElement->GetChildList()->Count(); k++ ){
tmp=pElement->GetChildList()->GetObject( k );
Print( tmp, buffer , false);
}
@@ -1241,7 +1241,7 @@ XMLFile *SimpleXMLParser::Execute( SvMemoryStream *pStream )
pCurNode = pXMLFile;
pCurData = NULL;
- sal_uIntPtr nPos = pStream->Tell();
+ sal_uLong nPos = pStream->Tell();
pStream->Seek( STREAM_SEEK_TO_END );
aErrorInformation.eCode = XML_ERROR_NONE;
generated by cgit (git 2.34.1) at 2025-02-05 03:02:16 +0000