diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-11-19 14:56:03 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-11-20 13:21:53 +0100 |
| commit | b5724a53b4f3e53768429544f604cd374ed49a0c (patch) | |
| tree | b2c0928c2e43f75cfeb06f98f1cd14cce7230f49 /filter | |
| parent | tools::Polygon::Clip() is broken with bezier curves (tdf#137068) (diff) | |
| download | core-b5724a53b4f3e53768429544f604cd374ed49a0c.tar.gz core-b5724a53b4f3e53768429544f604cd374ed49a0c.zip | |
Lengths passed into the SvxMSDffManager::Get*Data functions are all sal_uInt32
(i.e., rLength obtained from SvxMSDffManager::ReadCommonRecordHeader)
Change-Id: I04b51cb7e6cb771d89d07a86c00ee9fdaa72aaa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106176
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 0af775d32df3..199b668a1ddc 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5946,14 +5946,15 @@ void SvxMSDffManager::GetCtrlData(sal_uInt32 nOffsDggL) // from here on: Drawing Group Container i.e. document-wide valid data -void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLenDgg ) +void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uInt32 nLenDgg ) { sal_uInt8 nVer; sal_uInt16 nInst; sal_uInt16 nFbt; sal_uInt32 nLength; - sal_uLong nLenBStoreCont = 0, nLenFBSE = 0, nRead = 0; + sal_uInt32 nLenBStoreCont = 0, nLenFBSE = 0; + sal_uLong nRead = 0; // search for a BStore Container bool bOk = true; @@ -6033,7 +6034,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe // from now on: Drawing Container which means Pages (Sheet, Slide) - wide valid data // ================= ====== -void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, +void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uInt32 nLenDg, sal_uInt16 nDrawingContainerId ) { sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength; @@ -6070,7 +6071,7 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, } bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, - sal_uLong nLenShapeGroupCont, + sal_uInt32 nLenShapeGroupCont, bool bPatriarch, sal_uInt16 nDrawingContainerId ) { @@ -6113,7 +6114,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, } bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, - sal_uLong nLenShapeCont, + sal_uInt32 nLenShapeCont, sal_uLong nPosGroup, sal_uInt16 nDrawingContainerId ) { @@ -6123,7 +6124,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, // We are in a shape container (possibly more than one per shape group) and we now // have to fetch the shape id and file position (to be able to access them again later) // and the first BStore reference (if present). - sal_uLong nLenShapePropTbl = 0; + sal_uInt32 nLenShapePropTbl = 0; sal_uLong nReadSpCont = 0; // Store file offset of the shape containers or respectively the group(!). |