summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-12-10 12:11:58 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-14 19:19:00 +0100
commit38c008de39ef004a7f9089baba96bc408de67bae (patch)
tree43f37c4c36d8b1bf6786827ce112816f91bdf6fd /filter
parentc2f67e6ed60554de8b02b499fb93a60e703d533a (diff)
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.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/svdfppt.cxx8
1 files changed, 4 insertions, 4 deletions
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