filter/source/msfilter/svdfppt.cxx | 8 ++++----
include/filter/msfilter/escherex.hxx | 2 +-
sc/source/core/tool/autoform.cxx | 2 +-
sc/source/filter/rtf/rtfexp.cxx | 2 +-
sc/source/ui/docshell/impex.cxx | 6 +++---
sc/source/ui/unoobj/scdetect.cxx | 2 +-
sd/source/filter/ppt/pptin.cxx | 4 ++--
svx/source/gallery2/gallerybinaryengine.cxx | 2 +-
svx/source/table/tablertfexporter.cxx | 2 +-
sw/source/core/doc/tblafmt.cxx | 4 ++--
sw/source/filter/ww8/WW8FFData.cxx | 2 +-
sw/source/filter/ww8/docxexport.cxx | 2 +-
sw/source/filter/ww8/docxexport.hxx | 2 +-
sw/source/filter/ww8/rtfexport.cxx | 2 +-
sw/source/filter/ww8/rtfexport.hxx | 2 +-
sw/source/filter/ww8/wrtw8esh.cxx | 8 ++++----
sw/source/filter/ww8/wrtw8nds.cxx | 2 +-
sw/source/filter/ww8/wrtw8sty.cxx | 6 +++---
sw/source/filter/ww8/wrtww8.cxx | 12 ++++++------
sw/source/filter/ww8/wrtww8.hxx | 4 ++--
sw/source/filter/ww8/ww8atr.cxx | 4 ++--
sw/source/filter/ww8/ww8graf.cxx | 4 ++--
sw/source/filter/ww8/ww8par.cxx | 10 +++++-----
sw/source/filter/ww8/ww8par2.cxx | 2 +-
sw/source/filter/ww8/ww8par3.cxx | 4 ++--
sw/source/filter/ww8/ww8par4.cxx | 2 +-
sw/source/filter/ww8/ww8par5.cxx | 10 +++++-----
sw/source/filter/ww8/ww8scan.cxx | 2 +-
sw/source/filter/ww8/ww8toolbar.cxx | 6 +++---
sw/source/ui/dialog/ascfldlg.cxx | 4 ++--
vcl/source/bitmap/dibtools.cxx | 16 ++++++++--------
vcl/source/edit/textview.cxx | 2 +-
vcl/source/filter/graphicfilter.cxx | 8 ++++----
vcl/source/filter/jpeg/JpegReader.cxx | 2 +-
vcl/source/filter/svm/SvmConverter.cxx | 6 +++---
vcl/source/filter/svm/SvmReader.cxx | 2 +-
vcl/source/filter/wmf/emfwr.cxx | 8 ++++----
vcl/source/gdi/TypeSerializer.cxx | 2 +-
vcl/source/gdi/impgraph.cxx | 4 ++--
vcl/source/gdi/pdfwriter_impl.cxx | 4 ++--
40 files changed, 89 insertions(+), 89 deletions(-)
New commits:
commit 38c008de39ef004a7f9089baba96bc408de67bae
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Dec 10 12:11:58 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 14 19:19:00 2021 +0100
Stream::Tell returns sal_uInt64
Change-Id: I02e49d4f59c17a9868c4111ac91b5dd2715e689c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126630
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 93a9a9913335..21df91f595b6 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -632,7 +632,7 @@ void SdrEscherImport::RecolorGraphic( SvStream& rSt,
sal_uInt32 nRecLen, Graphic
{
for ( ; i > 0; i-- )
{
- sal_uInt32 nPos = rSt.Tell();
+ sal_uInt64 nPos = rSt.Tell();
sal_uInt16 nChanged;
rSt.ReadUInt16( nChanged );
if ( nChanged & 1 )
@@ -2170,7 +2170,7 @@ bool SdrPowerPointImport::ReadFontCollection()
DffRecordHeader* pEnvHd = aDocRecManager.GetRecordHeader(
PPT_PST_Environment );
if ( pEnvHd )
{
- sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring
it later
+ sal_uInt64 nOldFPos = rStCtrl.Tell(); // remember FilePos for
restoring it later
pEnvHd->SeekToContent( rStCtrl );
DffRecordHeader aListHd;
if ( SeekToRec( rStCtrl, PPT_PST_FontCollection,
pEnvHd->GetRecEndFilePos(), &aListHd ) )
@@ -2381,7 +2381,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj*
pTextObj, SdrTextObj*
bool SdrPowerPointImport::SeekToDocument( DffRecordHeader* pRecHd ) const
{
bool bRet;
- sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it
should the situation arise
+ sal_uInt64 nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it
should the situation arise
rStCtrl.Seek( m_nDocStreamPos );
DffRecordHeader aDocHd;
ReadDffRecordHeader( rStCtrl, aDocHd );
@@ -3052,7 +3052,7 @@ SdrObject*
SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage
{
SdrObject* pRet = nullptr;
std::optional<SfxItemSet> pSet;
- sal_uLong nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it
later
+ sal_uInt64 nOldFPos = rStCtrl.Tell(); // remember FilePos for restoring it
later
DffRecordHeader aPageHd;
if ( SeekToCurrentPage( &aPageHd ) )
{ // and now search for the background attributes of the Page
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index 0246ce12e713..da62cb52f957 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -1123,7 +1123,7 @@ public:
void SetEditAs( const OUString& rEditAs );
const OUString& GetEditAs() const { return mEditAs; }
SvStream& GetStream() const { return *mpOutStrm; }
- sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); }
+ sal_uInt64 GetStreamPos() const { return mpOutStrm->Tell(); }
// features during the creation of the following Containers:
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index a6b1094fb3ca..07f8b5134569 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -845,7 +845,7 @@ void ScAutoFormat::Load()
(AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
{
sal_uInt8 nChrSet, nCnt;
- tools::Long nPos = rStream.Tell();
+ sal_uInt64 nPos = rStream.Tell();
rStream.ReadUChar( nCnt ).ReadUChar( nChrSet );
if( rStream.Tell() != sal_uLong(nPos + nCnt) )
{
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 340e3cdab7c7..b8e4015fde1c 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -132,7 +132,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
}
rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr(
OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL
).WriteCharPtr( SAL_NEWLINE_STRING );
- sal_uLong nStrmPos = rStrm.Tell();
+ sal_uInt64 nStrmPos = rStrm.Tell();
for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
{
WriteCell( nTab, nRow, nCol );
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 5d8e755c18f6..b49f3b96fb50 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -928,7 +928,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm )
SCROW nStartRow = aRange.aStart.Row();
SCCOL nEndCol = aRange.aEnd.Col();
SCROW nEndRow = aRange.aEnd.Row();
- sal_uLong nOldPos = rStrm.Tell();
+ sal_uInt64 nOldPos = rStrm.Tell();
rStrm.StartReadingUnicodeText( rStrm.GetStreamCharSet() );
bool bData = !bSingle;
if( !bSingle)
@@ -1590,7 +1590,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
bool bQuotedAsText = pExtOptions && pExtOptions->IsQuotedAsText();
- sal_uLong nOriginalStreamPos = rStrm.Tell();
+ sal_uInt64 nOriginalStreamPos = rStrm.Tell();
ScDocumentImport aDocImport(rDoc);
do
@@ -2004,7 +2004,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
SCROW nStartRow = aRange.aStart.Row();
SCCOL nEndCol = aRange.aEnd.Col();
SCROW nEndRow = aRange.aEnd.Row();
- sal_uLong nOldPos = rStrm.Tell();
+ sal_uInt64 nOldPos = rStrm.Tell();
bool bData = !bSingle;
::std::vector< sal_uInt32 > aFormats;
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 08d265a38397..b5a50798b171 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -209,7 +209,7 @@ static bool lcl_MayBeDBase( SvStream& rStream )
// Empty dbf is >= 32*2+1 bytes in size.
const size_t nEmptyDbf = nHeaderBlockSize * 2 + 1;
- sal_uLong nSize = rStream.TellEnd();
+ sal_uInt64 nSize = rStream.TellEnd();
if ( nSize < nEmptyDbf )
return false;
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index f64a9bb93178..3da1736486ee 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -180,7 +180,7 @@ ImplSdPPTImport::ImplSdPPTImport( SdDrawDocument*
pDocument, SotStorage& rStorag
if ( mbDocumentFound )
{
- sal_uLong nOldPos = rStCtrl.Tell();
+ sal_uInt64 nOldPos = rStCtrl.Tell();
mxPicturesStream = rStorage_.OpenSotStream( "Pictures",
StreamMode::STD_READ );
pStData = mxPicturesStream.get();
@@ -1529,7 +1529,7 @@ bool Ppt97AnimationStlSortHelper::operator()( const
std::pair< SdrObject*, Ppt97
void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool
bNewAnimationsUsed )
{
- sal_uLong nOldFilePos = rStCtrl.Tell();
+ sal_uInt64 nOldFilePos = rStCtrl.Tell();
// set PageKind at page (up to now only PageKind::Standard or
PageKind::Notes)
if ( pPage->GetPageKind() == PageKind::Standard )
diff --git a/svx/source/gallery2/gallerybinaryengine.cxx
b/svx/source/gallery2/gallerybinaryengine.cxx
index c2216b2766f5..c86ffa6f5b69 100644
--- a/svx/source/gallery2/gallerybinaryengine.cxx
+++ b/svx/source/gallery2/gallerybinaryengine.cxx
@@ -772,7 +772,7 @@ SvStream& GalleryBinaryEngine::writeGalleryTheme(SvStream&
rOStm, const GalleryT
rOStm.WriteUInt32(COMPAT_FORMAT('G', 'A', 'L', 'R'))
.WriteUInt32(COMPAT_FORMAT('E', 'S', 'R', 'V'));
- const tools::Long nReservePos = rOStm.Tell();
+ const sal_uInt64 nReservePos = rOStm.Tell();
std::unique_ptr<VersionCompatWrite> pCompat(new VersionCompatWrite(rOStm,
2));
rOStm.WriteUInt32(rId).WriteBool(pThm->IsNameFromResource()); // From
version 2 and up
diff --git a/svx/source/table/tablertfexporter.cxx
b/svx/source/table/tablertfexporter.cxx
index d29cdc958cc7..a67e623611e3 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -143,7 +143,7 @@ void SdrTableRtfExporter::WriteRow( const Reference<
XPropertySet >& xRowSet, sa
}
mrStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_PARD ).WriteCharPtr(
OOO_STRING_SVTOOLS_RTF_PLAIN ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_INTBL
).WriteCharPtr( SAL_NEWLINE_STRING );
- sal_uLong nStrmPos = mrStrm.Tell();
+ sal_uInt64 nStrmPos = mrStrm.Tell();
for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
{
WriteCell( nCol, nRow );
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 35b502337f20..6385794aa620 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1067,9 +1067,9 @@ bool SwTableAutoFormatTable::Load( SvStream& rStream )
(AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) )
{
sal_uInt8 nChrSet, nCnt;
- tools::Long nPos = rStream.Tell();
+ sal_uInt64 nPos = rStream.Tell();
rStream.ReadUChar( nCnt ).ReadUChar( nChrSet );
- if( rStream.Tell() != sal_uLong(nPos + nCnt) )
+ if( rStream.Tell() != nPos + nCnt )
{
OSL_ENSURE( false, "The Header contains more or newer
Data" );
rStream.Seek( nPos + nCnt );
diff --git a/sw/source/filter/ww8/WW8FFData.cxx
b/sw/source/filter/ww8/WW8FFData.cxx
index 291cd845d439..ea7288e349ab 100644
--- a/sw/source/filter/ww8/WW8FFData.cxx
+++ b/sw/source/filter/ww8/WW8FFData.cxx
@@ -76,7 +76,7 @@ void WW8FFData::WriteOUString(SvStream * pDataStrm, const
OUString & rStr,
void WW8FFData::Write(SvStream * pDataStrm)
{
- sal_uLong nDataStt = pDataStrm->Tell();
+ sal_uInt64 nDataStt = pDataStrm->Tell();
static const sal_uInt8 aHeader[] =
{
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 0f1ca6ddb969..a3e4108cd06d 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -607,7 +607,7 @@ void DocxExport::OutputLinkedOLE( const OUString& )
// Nothing to implement here: WW8 only
}
-sal_uLong DocxExport::ReplaceCr( sal_uInt8 )
+sal_uInt64 DocxExport::ReplaceCr( sal_uInt8 )
{
// Completely unused for Docx export... only here for code sharing
// purpose with binary export
diff --git a/sw/source/filter/ww8/docxexport.hxx
b/sw/source/filter/ww8/docxexport.hxx
index cdd18c9e4510..3970597316d6 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -183,7 +183,7 @@ public:
virtual void DoFormText(const SwInputField * pField) override;
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
+ virtual sal_uInt64 ReplaceCr( sal_uInt8 nChar ) override;
/// Returns the relationd id
OString OutputChart( css::uno::Reference< css::frame::XModel > const &
xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr const & m_pSerializer );
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 68fd898ab1ff..795f6c46b6de 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -376,7 +376,7 @@ void RtfExport::DoFormText(const SwInputField* pField)
+ "}}");
}
-sal_uLong RtfExport::ReplaceCr(sal_uInt8 /*nChar*/)
+sal_uInt64 RtfExport::ReplaceCr(sal_uInt8 /*nChar*/)
{
// Completely unused for Rtf export... only here for code sharing
// purpose with binary export
diff --git a/sw/source/filter/ww8/rtfexport.hxx
b/sw/source/filter/ww8/rtfexport.hxx
index 36a735eb783a..0a495576ee6d 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -114,7 +114,7 @@ public:
void DoFormText(const SwInputField* pField) override;
- sal_uLong ReplaceCr(sal_uInt8 nChar) override;
+ sal_uInt64 ReplaceCr(sal_uInt8 nChar) override;
ExportFormat GetExportFormat() const override { return ExportFormat::RTF; }
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx
b/sw/source/filter/ww8/wrtw8esh.cxx
index c98f7689c4be..69528309fdd2 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -433,7 +433,7 @@ void WW8Export::DoComboBox(const OUString &rName,
OutputField(nullptr, ww::eFORMDROPDOWN, FieldString(ww::eFORMDROPDOWN),
FieldFlags::Start | FieldFlags::CmdStart);
// write the reference to the "picture" structure
- sal_uLong nDataStt = pDataStrm->Tell();
+ sal_uInt64 nDataStt = pDataStrm->Tell();
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x01 );
@@ -477,7 +477,7 @@ void WW8Export::DoFormText(const SwInputField * pField)
OutputField(nullptr, ww::eFORMTEXT, FieldString(ww::eFORMTEXT),
FieldFlags::Start | FieldFlags::CmdStart);
// write the reference to the "picture" structure
- sal_uLong nDataStt = pDataStrm->Tell();
+ sal_uInt64 nDataStt = pDataStrm->Tell();
m_pChpPlc->AppendFkpEntry( Strm().Tell() );
WriteChar( 0x01 );
@@ -1410,7 +1410,7 @@ void WW8Export::WriteOutliner(const OutlinerParaObject&
rParaObj, sal_uInt8 nTyp
aAttrIter.OutParaAttr(false);
- sal_uLong nPos = Strm().Tell();
+ sal_uInt64 nPos = Strm().Tell();
m_pPapPlc->AppendFkpEntry( Strm().Tell(),
pO->size(), pO->data() );
pO->clear();
@@ -1467,7 +1467,7 @@ void WW8Export::WriteEscher()
{
if (m_pEscher)
{
- sal_uLong nStart = pTableStrm->Tell();
+ sal_uInt64 nStart = pTableStrm->Tell();
m_pEscher->WritePictures();
m_pEscher->FinishEscher();
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 4f3ca7f94305..bf6e6fb2ea3d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1060,7 +1060,7 @@ bool WW8AttributeOutput::StartURL( const OUString &rUrl,
const OUString &rTarget
m_rWW8Export.OutputField( nullptr, ww::eHYPERLINK, sURL, FieldFlags::Start
| FieldFlags::CmdStart );
// write the reference to the "picture" structure
- sal_uLong nDataStt = m_rWW8Export.pDataStrm->Tell();
+ sal_uInt64 nDataStt = m_rWW8Export.pDataStrm->Tell();
m_rWW8Export.m_pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell() );
// WinWord 2000 doesn't write this - so it's a temp solution by W97 ?
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index 72c171bacdff..4f121ccd7cd9 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -672,7 +672,7 @@ void WW8AttributeOutput::StartStyles()
{
WW8Fib& rFib = *m_rWW8Export.pFib;
- sal_uLong nCurPos = m_rWW8Export.pTableStrm->Tell();
+ sal_uInt64 nCurPos = m_rWW8Export.pTableStrm->Tell();
if ( nCurPos & 1 ) // start on even
{
m_rWW8Export.pTableStrm->WriteChar( char(0) ); // Address
@@ -2047,7 +2047,7 @@ void WW8_WrPlcSepx::WritePlcSed( WW8Export& rWrt ) const
OSL_ENSURE(m_SectionAttributes.size() == static_cast<size_t>(aSects.size())
, "WritePlcSed(): arrays out of sync!");
OSL_ENSURE( aCps.size() == aSects.size() + 1, "WrPlcSepx: DeSync" );
- sal_uLong nFcStart = rWrt.pTableStrm->Tell();
+ sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
for( decltype(aSects)::size_type i = 0; i <= aSects.size(); i++ )
{
@@ -2371,7 +2371,7 @@ void WW8_WrPlcSubDoc::WriteGenericPlc( WW8Export& rWrt,
sal_uInt8 nTTyp,
WW8_FC& rTextStart, sal_Int32& rTextCount, WW8_FC& rRefStart, sal_Int32&
rRefCount ) const
{
- sal_uLong nFcStart = rWrt.pTableStrm->Tell();
+ sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
sal_uInt16 nLen = aCps.size();
if ( !nLen )
return;
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index d179858fd3f3..0e495ab92af3 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -907,7 +907,7 @@ void WW8_WrMagicTable::Write( WW8Export& rWrt )
{
if( WW8_WrPlc1::Count() <= 1 )
return;
- sal_uLong nFcStart = rWrt.pTableStrm->Tell();
+ sal_uInt64 nFcStart = rWrt.pTableStrm->Tell();
WW8_WrPlc1::Write( *rWrt.pTableStrm );
rWrt.pFib->m_fcPlcfTch = nFcStart;
rWrt.pFib->m_lcbPlcfTch = rWrt.pTableStrm->Tell() - nFcStart;
@@ -990,7 +990,7 @@ void WW8_WrPlcPn::AppendFkpEntry(WW8_FC nEndFc,short
nVarLen,const sal_uInt8* pS
*p++ = *pSprms++;
nVarLen -= 2;
- tools::Long nDataPos = rWrt.pDataStrm->Tell();
+ sal_uInt64 nDataPos = rWrt.pDataStrm->Tell();
SwWW8Writer::WriteShort( *rWrt.pDataStrm, nVarLen );
rWrt.pDataStrm->WriteBytes(pSprms, nVarLen);
@@ -1493,13 +1493,13 @@ void WW8Export::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo)
void WW8Export::AppendBookmark( const OUString& rName )
{
- sal_uLong nSttCP = Fc2Cp( Strm().Tell() );
+ sal_uInt64 nSttCP = Fc2Cp( Strm().Tell() );
m_pBkmks->Append( nSttCP, rName );
}
void WW8Export::AppendBookmarkEndWithCorrection( const OUString& rName )
{
- sal_uLong nEndCP = Fc2Cp( Strm().Tell() );
+ sal_uInt64 nEndCP = Fc2Cp( Strm().Tell() );
m_pBkmks->Append( nEndCP - 1, rName );
}
@@ -3296,11 +3296,11 @@ void MSWordExportBase::CollectOutlineBookmarks(const
SwDoc &rDoc)
namespace
{
- const sal_uLong WW_BLOCKSIZE = 0x200;
+ const sal_uInt64 WW_BLOCKSIZE = 0x200;
ErrCode EncryptRC4(msfilter::MSCodec_Std97& rCtx, SvStream &rIn, SvStream
&rOut)
{
- sal_uLong nLen = rIn.TellEnd();
+ sal_uInt64 nLen = rIn.TellEnd();
rIn.Seek(0);
sal_uInt8 in[WW_BLOCKSIZE];
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 72e5a8d65e1e..875625576a14 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -809,7 +809,7 @@ public:
// Compute the number format for WW dates
bool GetNumberFormat(const SwField& rField, OUString& rStr);
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) = 0;
+ virtual sal_uInt64 ReplaceCr( sal_uInt8 nChar ) = 0;
const SfxPoolItem* HasItem( sal_uInt16 nWhich ) const;
@@ -1090,7 +1090,7 @@ public:
void WriteAsStringTable(const std::vector<OUString>&, sal_Int32& rfcSttbf,
sal_Int32& rlcbSttbf);
- virtual sal_uLong ReplaceCr( sal_uInt8 nChar ) override;
+ virtual sal_uInt64 ReplaceCr( sal_uInt8 nChar ) override;
virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t() ) override;
void WriteChar( sal_Unicode c ) override;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index cbafa7a909a0..490f7f296757 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3839,13 +3839,13 @@ void WW8AttributeOutput::FormatFrameSize( const
SwFormatFrameSize& rSize )
*
* @return FilePos + 1 of the replaced CR or 0 if nothing was replaced.
*/
-sal_uLong WW8Export::ReplaceCr( sal_uInt8 nChar )
+sal_uInt64 WW8Export::ReplaceCr( sal_uInt8 nChar )
{
OSL_ENSURE( nChar, "replaced with 0 crashes WW97/95" );
bool bReplaced = false;
SvStream& rStrm = Strm();
- sal_uLong nRetPos = 0, nPos = rStrm.Tell();
+ sal_uInt64 nRetPos = 0, nPos = rStrm.Tell();
//If there is at least two characters already output
if (nPos - 2 >= o3tl::make_unsigned(pFib->m_fcMin))
{
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 35476fd90c34..edd44eb3cfd5 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -1026,7 +1026,7 @@ void SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
bool* pbContainsGraphics, SvxMSDffImportRec const * pRecord)
{
SwFrameFormat* pFlyFormat = nullptr;
- sal_uLong nOld = m_pStrm->Tell();
+ sal_uInt64 nOld = m_pStrm->Tell();
ManTypes eType = m_xPlcxMan->GetManType() == MAN_HDFT ? MAN_TXBX_HDFT :
MAN_TXBX;
@@ -2534,7 +2534,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer(
tools::Long nGrafAnchorCp )
if( m_bVer67 )
{
- tools::Long nOldPos = m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_pStrm->Tell();
m_nDrawXOfs = m_nDrawYOfs = 0;
ReadGrafLayer1(*pPF, nGrafAnchorCp);
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9de1a301e0a5..be454d9e8ce2 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1108,7 +1108,7 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
if (rSt.ReadBytes(aBuffer.data(), nBufferSize) == nBufferSize)
{
aMemStream.WriteBytes(aBuffer.data(), nBufferSize);
- sal_uInt8 nStreamSize = aMemStream.TellEnd();
+ sal_uInt64 nStreamSize = aMemStream.TellEnd();
aMemStream.Seek( STREAM_SEEK_TO_BEGIN );
bool bRet = 4 <= nStreamSize;
sal_uInt16 nRawRecId,nRawRecSize;
@@ -3689,7 +3689,7 @@ bool SwWW8ImplReader::ReadChar(tools::Long nPosCp,
tools::Long nCpOfs)
bool bReadObj = IsInlineEscherHack();
if( bReadObj )
{
- tools::Long nCurPos = m_pStrm->Tell();
+ sal_uInt64 nCurPos = m_pStrm->Tell();
sal_uInt16 nWordCode(0);
if( m_bIsUnicode )
@@ -4921,7 +4921,7 @@ void WW8Customizations::Import( SwDocShell* pShell )
try
{
Tcg aTCG;
- tools::Long nCur = mpTableStream->Tell();
+ sal_uInt64 nCur = mpTableStream->Tell();
if (!checkSeek(*mpTableStream, mWw8Fib.m_fcCmds)) // point at tgc
record
{
SAL_WARN("sw.ww8", "** Seek to Customization data failed!!!! ");
@@ -6266,7 +6266,7 @@ ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss)
// Test for own 97 fake!
if (m_pStg && 0xa5ec == nMagic)
{
- sal_uLong nCurPos = m_pStrm->Tell();
+ sal_uInt64 nCurPos = m_pStrm->Tell();
if (checkSeek(*m_pStrm, nCurPos + 2))
{
sal_uInt32 nfcMin(0);
@@ -6596,7 +6596,7 @@ bool SwMSDffManager::GetOLEStorageName(sal_uInt32 nOLEId,
OUString& rStorageName
// We should then find the EmbeddedField and the corresponding Sprms
// in that Area.
// We only need the Sprm for the Picture Id.
- tools::Long nOldPos = rReader.m_pStrm->Tell();
+ sal_uInt64 nOldPos = rReader.m_pStrm->Tell();
{
// #i32596# - consider return value of method
// <rReader.GetTxbxTextSttEndCp(..)>. If it returns false, method
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index cf07cb7cf038..002a85ce7e71 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3976,7 +3976,7 @@ void WW8RStyle::Import1Style( sal_uInt16 nNr )
bool bOldNoImp = PrepareStyle(rSI, static_cast<ww::sti>(xStd->sti), nNr,
xStd->istdNext);
// if something is interpreted wrong, this should make it work again
- tools::Long nPos = mpStStrm->Tell();
+ sal_uInt64 nPos = mpStStrm->Tell();
//Variable parts of the STD start at even byte offsets, but "inside
//the STD", which I take to meaning even in relation to the starting
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index aab719c99d7d..a3a01db9304b 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1164,7 +1164,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_,
SwWW8ImplReader& rReader_)
// create Arrays
bool bLVLOk = true;
- tools::Long nOriginalPos = rSt.Tell();
+ sal_uInt64 nOriginalPos = rSt.Tell();
// 1. read PLCF LST and create list templates in Writer
@@ -2105,7 +2105,7 @@ bool
SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
sal_uLong nOffset = m_nPicLocFc;
aSave.Restore(this);
- sal_uLong nOldPos = m_pDataStream->Tell();
+ sal_uInt64 nOldPos = m_pDataStream->Tell();
WW8_PIC aPic;
bool bValid = checkSeek(*m_pDataStream, nOffset) &&
PicRead(m_pDataStream, &aPic, m_bVer67);
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 99f2647db76b..ff6ea0490028 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -404,7 +404,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
if (bOleOk)
{
- sal_uLong nOldPos = m_pDataStream->Tell();
+ sal_uInt64 nOldPos = m_pDataStream->Tell();
SvStream *pTmpData = nullptr;
if (m_nObjLocFc < m_pDataStream->TellEnd())
{
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 85af5106bfaa..8bc9dbb75dbf 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -158,7 +158,7 @@ tools::Long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
if( nLen > MAX_FIELDLEN )
nLen = MAX_FIELDLEN;
- tools::Long nOldPos = m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_pStrm->Tell();
m_xSBase->WW8ReadString( *m_pStrm, aVal, pB->GetStartPos(), nLen,
m_eStructCharSet );
m_pStrm->Seek( nOldPos );
@@ -957,7 +957,7 @@ tools::Long SwWW8ImplReader::Read_Field(WW8PLCFManResult*
pRes)
if (aF.bResNest && !AcceptableNestedField(aF.nId))
return aF.nLen; // Result nested -> unusable
- tools::Long nOldPos = m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_pStrm->Tell();
OUString aStr;
aF.nLCode = m_xSBase->WW8ReadString( *m_pStrm, aStr,
m_xPlcxMan->GetCpOfs()+
aF.nSCode, aF.nLCode, m_eTextCharSet );
@@ -1136,7 +1136,7 @@ void SwWW8ImplReader::InsertTagField( const sal_uInt16
nId, const OUString& rTag
WW8_CP SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
{
- tools::Long nOldPos = m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_pStrm->Tell();
WW8_CP nStart = pF->nSCode - 1; // starting with 0x19
WW8_CP nL = pF->nLen; // Total length with result and
nest
@@ -1196,7 +1196,7 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF,
OUString& rStr )
// GetFieldResult allocates a string and reads the resulted field
OUString SwWW8ImplReader::GetFieldResult( WW8FieldDesc const * pF )
{
- tools::Long nOldPos = m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_pStrm->Tell();
WW8_CP nStart = pF->nSRes; // result start
WW8_CP nL = pF->nLRes; // result length
@@ -3680,7 +3680,7 @@ void SwWW8ImplReader::Read_FieldVanish( sal_uInt16, const
sal_uInt8*, short nLen
return;
m_bIgnoreText = true;
- tools::Long nOldPos = m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_pStrm->Tell();
WW8_CP nStartCp = m_xPlcxMan->Where() + m_xPlcxMan->GetCpOfs();
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index cf81cc434560..038f91ffbb9f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6221,7 +6221,7 @@ WW8Fib::WW8Fib(SvStream& rSt, sal_uInt8 nWantedVersion,
sal_uInt32 nOffset):
identify the values for PLCF and PLF LFO
and PLCF for the textbox break descriptors
*/
- tools::Long nOldPos = rSt.Tell();
+ sal_uInt64 nOldPos = rSt.Tell();
rSt.Seek( 0x02da );
rSt.ReadInt32( m_fcSttbFnm );
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx
b/sw/source/filter/ww8/ww8toolbar.cxx
index 168fcc068950..aca7004f086a 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -119,7 +119,7 @@ bool SwCTBWrapper::Read( SvStream& rS )
Tcg255SubStruct::Read( rS );
rS.ReadUInt16( reserved2 ).ReadUChar( reserved3 ).ReadUInt16( reserved4
).ReadUInt16( reserved5 );
rS.ReadInt16( cbTBD ).ReadUInt16( cCust ).ReadInt32( cbDTBC );
- tools::Long nExpectedPos = rS.Tell() + cbDTBC;
+ sal_uInt64 nExpectedPos = rS.Tell() + cbDTBC;
if ( cbDTBC )
{
// cbDTBC is the size in bytes of the SwTBC array
@@ -139,12 +139,12 @@ bool SwCTBWrapper::Read( SvStream& rS )
bytesToRead = cbDTBC - ( rS.Tell() - nStart );
} while ( bytesToRead > 0 );
}
- if ( static_cast< tools::Long >( rS.Tell() ) != nExpectedPos )
+ if ( rS.Tell() != nExpectedPos )
{
// Strange error condition, shouldn't happen ( but does in at least
// one test document ) In the case where it happens the SwTBC &
// TBCHeader records seem blank??? ( and incorrect )
- SAL_WARN_IF( static_cast< tools::Long >(rS.Tell()) != nExpectedPos,
"sw.ww8","### Error: Expected pos not equal to actual pos after reading rtbdc");
+ SAL_WARN_IF( rS.Tell() != nExpectedPos, "sw.ww8","### Error: Expected
pos not equal to actual pos after reading rtbdc");
SAL_INFO("sw.ww8","\tPos now is 0x" << std::hex << rS.Tell() << "
should be 0x" << std::hex << nExpectedPos );
// seek to correct position after rtbdc
rS.Seek( nExpectedPos );
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index 2812cc3be8a5..20f76efc4f12 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -112,7 +112,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent,
SwDocShell& rDocSh,
if( pStream )
{
char aBuffer[ 4098 ];
- const sal_uLong nOldPos = pStream->Tell();
+ const sal_uInt64 nOldPos = pStream->Tell();
const size_t nBytesRead = pStream->ReadBytes(aBuffer, 4096);
pStream->Seek( nOldPos );
@@ -123,7 +123,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent,
SwDocShell& rDocSh,
}
bool bCR = false, bLF = false, bNullChar = false;
- for( sal_uLong nCnt = 0; nCnt < nBytesRead; ++nCnt )
+ for( sal_uInt64 nCnt = 0; nCnt < nBytesRead; ++nCnt )
switch( aBuffer[ nCnt ] )
{
case 0x0: bNullChar = true; break;
diff --git a/vcl/source/bitmap/dibtools.cxx b/vcl/source/bitmap/dibtools.cxx
index 55e287e44411..65117319afe5 100644
--- a/vcl/source/bitmap/dibtools.cxx
+++ b/vcl/source/bitmap/dibtools.cxx
@@ -779,10 +779,10 @@ bool ImplReadDIBBits(SvStream& rIStm, DIBV5Header&
rHeader, BitmapWriteAccess& r
return rIStm.GetError() == ERRCODE_NONE;
}
-bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha,
sal_uLong nOffset, bool bIsMask, bool bMSOFormat)
+bool ImplReadDIBBody(SvStream& rIStm, Bitmap& rBmp, AlphaMask* pBmpAlpha,
sal_uInt64 nOffset, bool bIsMask, bool bMSOFormat)
{
DIBV5Header aHeader;
- const sal_uLong nStmPos = rIStm.Tell();
+ const sal_uInt64 nStmPos = rIStm.Tell();
bool bTopDown(false);
if (!ImplReadDIBInfoHeader(rIStm, aHeader, bTopDown, bMSOFormat))
@@ -1412,8 +1412,8 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream&
rOStm, BitmapReadAccess c
{
const MapMode aMapPixel(MapUnit::MapPixel);
DIBV5Header aHeader;
- sal_uLong nImageSizePos(0);
- sal_uLong nEndPos(0);
+ sal_uInt64 nImageSizePos(0);
+ sal_uInt64 nEndPos(0);
sal_uInt32 nCompression(COMPRESS_NONE);
bool bRet(false);
@@ -1530,8 +1530,8 @@ bool ImplWriteDIBBody(const Bitmap& rBitmap, SvStream&
rOStm, BitmapReadAccess c
{
ZCodec aCodec;
SvMemoryStream aMemStm(aHeader.nSizeImage + 4096, 65535);
- sal_uLong nCodedPos(rOStm.Tell());
- sal_uLong nLastPos(0);
+ sal_uInt64 nCodedPos(rOStm.Tell());
+ sal_uInt64 nLastPos(0);
sal_uInt32 nCodedSize(0);
sal_uInt32 nUncodedSize(0);
@@ -1655,7 +1655,7 @@ bool ImplWriteDIB(
Bitmap::ScopedReadAccess pAcc(const_cast< Bitmap& >(rSource));
Bitmap::ScopedReadAccess pAccAlpha;
const SvStreamEndian nOldFormat(rOStm.GetEndian());
- const sal_uLong nOldPos(rOStm.Tell());
+ const sal_uInt64 nOldPos(rOStm.Tell());
rOStm.SetEndian(SvStreamEndian::LITTLE);
@@ -1713,7 +1713,7 @@ bool ReadDIBBitmapEx(
if(bRetval)
{
// base bitmap was read, set as return value and try to read alpha
extra-data
- const sal_uLong nStmPos(rIStm.Tell());
+ const sal_uInt64 nStmPos(rIStm.Tell());
sal_uInt32 nMagic1(0);
sal_uInt32 nMagic2(0);
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 29dad16d1282..ef83beab49ca 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -85,7 +85,7 @@ css::uno::Any TETextDataObject::getTransferData( const
css::datatransfer::DataFl
}
else if ( nT == SotClipboardFormatId::HTML )
{
- sal_uLong nLen = GetHTMLStream().TellEnd();
+ sal_uInt64 nLen = GetHTMLStream().TellEnd();
GetHTMLStream().Seek(0);
css::uno::Sequence< sal_Int8 > aSeq( nLen );
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 44b19902d479..e9fb9d73bafb 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -488,7 +488,7 @@ ErrCode GraphicFilter::CanImportGraphic( const
INetURLObject& rPath,
ErrCode GraphicFilter::CanImportGraphic( const OUString& rMainUrl, SvStream&
rIStream,
sal_uInt16 nFormat, sal_uInt16*
pDeterminedFormat )
{
- sal_uLong nStreamPos = rIStream.Tell();
+ sal_uInt64 nStreamPos = rIStream.Tell();
ErrCode nRes = ImpTestOrFindFormat( rMainUrl, rIStream, nFormat );
rIStream.Seek(nStreamPos);
@@ -772,7 +772,7 @@ Graphic GraphicFilter::ImportUnloadedGraphic(SvStream&
rIStream, sal_uInt64 size
ResetLastError();
- const sal_uLong nStreamBegin = rIStream.Tell();
+ const sal_uInt64 nStreamBegin = rIStream.Tell();
rIStream.Seek(nStreamBegin);
@@ -1030,8 +1030,8 @@ ErrCode GraphicFilter::readSVG(SvStream & rStream,
Graphic & rGraphic, GfxLinkTy
{
ErrCode aReturnCode = ERRCODE_NONE;
- const sal_uInt32 nStreamPosition(rStream.Tell());
- const sal_uInt32 nStreamLength(rStream.remainingSize());
+ const sal_uInt64 nStreamPosition(rStream.Tell());
+ const sal_uInt64 nStreamLength(rStream.remainingSize());
bool bOkay(false);
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx
b/vcl/source/filter/jpeg/JpegReader.cxx
index 026ff1640428..c68ba88d7a16 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -58,7 +58,7 @@ static tools::Long StreamRead( SvStream* pStream, void*
pBuffer, tools::Long nBu
if( pStream->GetError() != ERRCODE_IO_PENDING )
{
- tools::Long nInitialPosition = pStream->Tell();
+ sal_uInt64 nInitialPosition = pStream->Tell();
nRead = static_cast<tools::Long>(pStream->ReadBytes(pBuffer,
nBufferSize));
diff --git a/vcl/source/filter/svm/SvmConverter.cxx
b/vcl/source/filter/svm/SvmConverter.cxx
index a5618ab95fd6..30f3048f3792 100644
--- a/vcl/source/filter/svm/SvmConverter.cxx
+++ b/vcl/source/filter/svm/SvmConverter.cxx
@@ -137,7 +137,7 @@ static bool ImplReadMapMode(SvStream& rIStm, MapMode&
rMapMode)
static void ImplReadUnicodeComment( sal_uInt32 nStrmPos, SvStream& rIStm,
OUString& rString )
{
- sal_uInt32 nOld = rIStm.Tell();
+ sal_uInt64 nOld = rIStm.Tell();
if ( nStrmPos )
{
sal_uInt16 nType;
@@ -252,7 +252,7 @@ namespace
#define LF_FACESIZE 32
-void static lcl_error( SvStream& rIStm, const SvStreamEndian& nOldFormat,
sal_uLong nPos)
+void static lcl_error( SvStream& rIStm, const SvStreamEndian& nOldFormat,
sal_uInt64 nPos)
{
rIStm.SetError(SVSTREAM_FILEFORMAT_ERROR);
rIStm.SetEndian(nOldFormat);
@@ -261,7 +261,7 @@ void static lcl_error( SvStream& rIStm, const
SvStreamEndian& nOldFormat, sal_uL
}
void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
{
- const sal_uLong nPos = rIStm.Tell();
+ const sal_uInt64 nPos = rIStm.Tell();
const SvStreamEndian nOldFormat = rIStm.GetEndian();
rIStm.SetEndian( SvStreamEndian::LITTLE );
diff --git a/vcl/source/filter/svm/SvmReader.cxx
b/vcl/source/filter/svm/SvmReader.cxx
index 490ff002854e..284a9a8e5935 100644
--- a/vcl/source/filter/svm/SvmReader.cxx
+++ b/vcl/source/filter/svm/SvmReader.cxx
@@ -68,7 +68,7 @@ SvStream& SvmReader::Read(GDIMetaFile& rMetaFile,
ImplMetaReadData* pData)
return mrStream;
}
- sal_uLong nStmPos = mrStream.Tell();
+ sal_uInt64 nStmPos = mrStream.Tell();
SvStreamEndian nOldFormat = mrStream.GetEndian();
mrStream.SetEndian(SvStreamEndian::LITTLE);
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index 84a18beb63fe..8f545a7b07a0 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -238,7 +238,7 @@ void EMFWriter::ImplWritePlusFillPolygonRecord( const
tools::Polygon& rPoly, sal
bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf)
{
- const sal_uLong nHeaderPos = m_rStm.Tell();
+ const sal_uInt64 nHeaderPos = m_rStm.Tell();
maVDev->EnableOutput( false );
maVDev->SetMapMode( rMtf.GetPrefMapMode() );
@@ -302,7 +302,7 @@ bool EMFWriter::WriteEMF(const GDIMetaFile& rMtf)
ImplEndRecord();
// write header
- const sal_uLong nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos );
+ const sal_uInt64 nEndPos = m_rStm.Tell(); m_rStm.Seek( nHeaderPos );
m_rStm.WriteUInt32( 0x00000001 ).WriteUInt32( 108 ) //use [MS-EMF
2.2.11] HeaderExtension2 Object
.WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( aMtfSizePix.Width() -
1 ).WriteInt32( aMtfSizePix.Height() - 1 )
@@ -813,7 +813,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp,
const Point& rPt,
m_rStm.WriteInt32( 0 ).WriteInt32( 0 ).WriteInt32( aBmpSizePixel.Width()
).WriteInt32( aBmpSizePixel.Height() );
// write offset positions and sizes later
- const sal_uLong nOffPos = m_rStm.Tell();
+ const sal_uInt64 nOffPos = m_rStm.Tell();
m_rStm.SeekRel( 16 );
m_rStm.WriteUInt32( 0 ).WriteInt32( ( RasterOp::Xor ==
maVDev->GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP );
@@ -851,7 +851,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp,
const Point& rPt,
m_rStm.WriteBytes( aMemStm.GetData(), nDIBSize );
- const sal_uLong nEndPos = m_rStm.Tell();
+ const sal_uInt64 nEndPos = m_rStm.Tell();
m_rStm.Seek( nOffPos );
m_rStm.WriteUInt32( 80 ).WriteUInt32( nHeaderSize + nPalSize );
m_rStm.WriteUInt32( 80 + nHeaderSize + nPalSize ).WriteUInt32( nImageSize
);
diff --git a/vcl/source/gdi/TypeSerializer.cxx
b/vcl/source/gdi/TypeSerializer.cxx
index 403ec5e56428..7834170578c8 100644
--- a/vcl/source/gdi/TypeSerializer.cxx
+++ b/vcl/source/gdi/TypeSerializer.cxx
@@ -170,7 +170,7 @@ void TypeSerializer::readGraphic(Graphic& rGraphic)
if (mrStream.GetError())
return;
- const sal_uLong nInitialStreamPosition = mrStream.Tell();
+ const sal_uInt64 nInitialStreamPosition = mrStream.Tell();
sal_uInt32 nType;
// if there is no more data, avoid further expensive
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 137bd50d283c..a10844e1cada 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1278,14 +1278,14 @@ bool ImpGraphic::swapOutContent(SvStream& rStream)
rStream.WriteInt32(0);
// write data block
- const sal_uLong nDataStart = rStream.Tell();
+ const sal_uInt64 nDataStart = rStream.Tell();
swapOutGraphic(rStream);
if (!rStream.GetError())
{
// Write the written length th the header
- const sal_uLong nCurrentPosition = rStream.Tell();
+ const sal_uInt64 nCurrentPosition = rStream.Tell();
rStream.Seek(nDataFieldPos);
rStream.WriteInt32(nCurrentPosition - nDataStart);
rStream.Seek(nCurrentPosition);
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 3db1ca90f235..e89b1f65949f 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1564,7 +1564,7 @@ bool PDFWriterImpl::compressStream( SvMemoryStream*
pStream )
{
if (!g_bDebugDisableCompression)
{
- sal_uLong nEndPos = pStream->TellEnd();
+ sal_uInt64 nEndPos = pStream->TellEnd();
pStream->Seek( STREAM_SEEK_TO_BEGIN );
ZCodec aCodec( 0x4000, 0x4000 );
SvMemoryStream aStream;
@@ -7993,7 +7993,7 @@ void PDFWriterImpl::writeTransparentObject(
TransparencyEmit& rObject )
CHECK_RETURN2( updateObject( rObject.m_nObject ) );
bool bFlateFilter = compressStream( rObject.m_pContentStream.get() );
- sal_uLong nSize = rObject.m_pContentStream->TellEnd();
+ sal_uInt64 nSize = rObject.m_pContentStream->TellEnd();
rObject.m_pContentStream->Seek( STREAM_SEEK_TO_BEGIN );
if (g_bDebugDisableCompression)
{
