diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-11-19 15:21:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-11-20 20:48:50 +0100 |
| commit | 72877e3ade74f7517d9d85c9e7baf94d8ad49d49 (patch) | |
| tree | 74dc7f1fba017f081455fe26c4b7674a8a55b3a9 /include | |
| parent | 18a4ad0a47dc1bcec1b9387126d7c917f7063339 (diff) | |
SvStream::{Tell,TellEnd,remainingSize} all return sal_uInt64
...so use that type where appropriate here
Change-Id: I3e419457bc04b5908128bad04eb16c72052d2ebf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106267
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index dc171b3e60da..3561d4ad9468 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -425,7 +425,7 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader void GetFidclData(sal_uInt32 nOffsDgg); protected: - typedef std::map<sal_uInt32, sal_uInt32> OffsetMap; + typedef std::map<sal_uInt32, sal_uInt64> OffsetMap; OUString maBaseURL; sal_uInt32 mnIdClusters; // while only knowing the shapeid @@ -478,7 +478,7 @@ protected: sal_uInt16 nDrawingContainerId ); bool GetShapeContainerData( SvStream& rSt, sal_uInt32 nLenShapeCont, - sal_uLong nPosGroup, + sal_uInt64 nPosGroup, sal_uInt16 nDrawingContainerId ); SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ); @@ -754,13 +754,13 @@ public: struct SvxMSDffShapeInfo { sal_uInt32 nShapeId; ///< shape id, used in PLCF SPA and in mso_fbtSp (FSP) - sal_uLong nFilePos; ///< offset of the shape in control stream for + sal_uInt64 nFilePos; ///< offset of the shape in control stream for ///< potential later access to it sal_uInt32 nTxBxComp; bool bReplaceByFly :1; ///< shape can be replaced by a frame in Writer - explicit SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0, + explicit SvxMSDffShapeInfo(sal_uInt64 nFPos, sal_uInt32 nId=0, // sal_uLong nBIdx=0, sal_uInt16 nSeqId=0, sal_uInt16 nBoxId=0): nShapeId( nId ), nFilePos( nFPos ), |