Kaydet (Commit) b9e75051 authored tarafından Muzaffer Kadir YILMAZ's avatar Muzaffer Kadir YILMAZ Kaydeden (comit) Michael Stahl

tdf#114441 - Convert variables use Tell() function sal_uLong to sal_uInt64

Change-Id: I356d771920f08fedd0843a5482615f787edf4f9f
Reviewed-on: https://gerrit.libreoffice.org/67688
Tested-by: Jenkins
Reviewed-by: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 4506a899
...@@ -918,7 +918,7 @@ void WW8_WrPlcField::Write( WW8Export& rWrt ) ...@@ -918,7 +918,7 @@ void WW8_WrPlcField::Write( WW8Export& rWrt )
if( pfc && plc ) if( pfc && plc )
{ {
sal_uLong nFcStart = rWrt.pTableStrm->Tell(); sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
WW8_WrPlc1::Write( *rWrt.pTableStrm ); WW8_WrPlc1::Write( *rWrt.pTableStrm );
*pfc = nFcStart; *pfc = nFcStart;
*plc = rWrt.pTableStrm->Tell() - nFcStart; *plc = rWrt.pTableStrm->Tell() - nFcStart;
...@@ -967,7 +967,7 @@ void SwWW8Writer::FillCount( SvStream& rStrm, sal_uLong nCount ) ...@@ -967,7 +967,7 @@ void SwWW8Writer::FillCount( SvStream& rStrm, sal_uLong nCount )
sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos ) sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos )
{ {
sal_uLong nCurPos = rStrm.Tell(); sal_uInt64 nCurPos = rStrm.Tell();
if( !nEndPos ) // nEndPos == 0 -> next Page if( !nEndPos ) // nEndPos == 0 -> next Page
nEndPos = (nCurPos + 0x1ff) & ~0x1ffUL; nEndPos = (nCurPos + 0x1ff) & ~0x1ffUL;
...@@ -1072,7 +1072,7 @@ void WW8_WrPlcPn::WriteFkps() ...@@ -1072,7 +1072,7 @@ void WW8_WrPlcPn::WriteFkps()
void WW8_WrPlcPn::WritePlc() void WW8_WrPlcPn::WritePlc()
{ {
sal_uLong nFcStart = rWrt.pTableStrm->Tell(); sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
decltype(m_Fkps)::size_type i; decltype(m_Fkps)::size_type i;
for (i = 0; i < m_Fkps.size(); ++i) for (i = 0; i < m_Fkps.size(); ++i)
...@@ -1382,7 +1382,7 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc) ...@@ -1382,7 +1382,7 @@ void WW8_WrPct::AppendPc(WW8_FC nStartFc)
void WW8_WrPct::WritePc( WW8Export& rWrt ) void WW8_WrPct::WritePc( WW8Export& rWrt )
{ {
sal_uLong nPctStart; sal_uInt64 nPctStart;
sal_uLong nOldPos, nEndPos; sal_uLong nOldPos, nEndPos;
nPctStart = rWrt.pTableStrm->Tell(); // Start piece table nPctStart = rWrt.pTableStrm->Tell(); // Start piece table
...@@ -1713,7 +1713,7 @@ void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings, ...@@ -1713,7 +1713,7 @@ void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
// FilePos. Used to insert lengths after the fact. // FilePos. Used to insert lengths after the fact.
void SwWW8Writer::WriteShort( SvStream& rStrm, sal_uLong nPos, sal_Int16 nVal ) void SwWW8Writer::WriteShort( SvStream& rStrm, sal_uLong nPos, sal_Int16 nVal )
{ {
sal_uLong nOldPos = rStrm.Tell(); // remember Pos sal_uInt64 nOldPos = rStrm.Tell(); // remember Pos
rStrm.Seek( nPos ); rStrm.Seek( nPos );
SwWW8Writer::WriteShort( rStrm, nVal ); SwWW8Writer::WriteShort( rStrm, nVal );
rStrm.Seek( nOldPos ); rStrm.Seek( nOldPos );
...@@ -1721,7 +1721,7 @@ void SwWW8Writer::WriteShort( SvStream& rStrm, sal_uLong nPos, sal_Int16 nVal ) ...@@ -1721,7 +1721,7 @@ void SwWW8Writer::WriteShort( SvStream& rStrm, sal_uLong nPos, sal_Int16 nVal )
void SwWW8Writer::WriteLong( SvStream& rStrm, sal_uLong nPos, sal_Int32 nVal ) void SwWW8Writer::WriteLong( SvStream& rStrm, sal_uLong nPos, sal_Int32 nVal )
{ {
sal_uLong nOldPos = rStrm.Tell(); // remember Pos sal_uInt64 nOldPos = rStrm.Tell(); // remember Pos
rStrm.Seek( nPos ); rStrm.Seek( nPos );
SwWW8Writer::WriteLong( rStrm, nVal ); SwWW8Writer::WriteLong( rStrm, nVal );
rStrm.Seek( nOldPos ); rStrm.Seek( nOldPos );
...@@ -1814,7 +1814,7 @@ void WW8Export::WriteStringAsPara( const OUString& rText ) ...@@ -1814,7 +1814,7 @@ void WW8Export::WriteStringAsPara( const OUString& rText )
aArr.push_back( 1 ); aArr.push_back( 1 );
} }
sal_uLong nPos = Strm().Tell(); sal_uInt64 nPos = Strm().Tell();
m_pPapPlc->AppendFkpEntry( nPos, aArr.size(), aArr.data() ); m_pPapPlc->AppendFkpEntry( nPos, aArr.size(), aArr.data() );
m_pChpPlc->AppendFkpEntry( nPos ); m_pChpPlc->AppendFkpEntry( nPos );
} }
...@@ -3847,7 +3847,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark ) ...@@ -3847,7 +3847,7 @@ void WW8Export::WriteFormData( const ::sw::mark::IFieldmark& rFieldmark )
ffname = aName.copy(0, nLen); ffname = aName.copy(0, nLen);
} }
sal_uLong nDataStt = pDataStrm->Tell(); sal_uInt64 nDataStt = pDataStrm->Tell();
m_pChpPlc->AppendFkpEntry(Strm().Tell()); m_pChpPlc->AppendFkpEntry(Strm().Tell());
WriteChar(0x01); WriteChar(0x01);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment