summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-11-06 14:28:34 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-11-07 07:33:05 +0100
commite2655495d544d51db68bb6ce94b3264290533bad (patch)
tree4e4bd58370a815412af94106c4822e0c2c67f9f1 /filter
parent4f5469ed0bb4dce1dc62180eb3d1c5e0257f6cc3 (diff)
convert nDrawingContainerId to sal_uInt16
which is all that can be stored anyhow Change-Id: Iaec28a97ed25004715accafc0cbd4bd620bfbba9 Reviewed-on: https://gerrit.libreoffice.org/44360 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/msdffimp.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 1fc80da83cb8..9c006116d403 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5847,7 +5847,7 @@ void SvxMSDffManager::GetCtrlData(sal_uInt32 nOffsDggL)
sal_uInt32 nMaxStrPos = rStCtrl.Tell();
nPos += nLength;
- unsigned long nDrawingContainerId = 1;
+ sal_uInt16 nDrawingContainerId = 1;
do
{
if (!checkSeek(rStCtrl, nPos))
@@ -5965,7 +5965,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe
// ================= ======
void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
- const unsigned long nDrawingContainerId )
+ sal_uInt16 nDrawingContainerId )
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
@@ -6003,7 +6003,7 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg,
bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
sal_uLong nLenShapeGroupCont,
bool bPatriarch,
- const unsigned long nDrawingContainerId )
+ sal_uInt16 nDrawingContainerId )
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
long nStartShapeGroupCont = rSt.Tell();
@@ -6043,7 +6043,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt,
bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt,
sal_uLong nLenShapeCont,
sal_uLong nPosGroup,
- const unsigned long nDrawingContainerId )
+ sal_uInt16 nDrawingContainerId )
{
sal_uInt8 nVer;sal_uInt16 nInst;sal_uInt16 nFbt;sal_uInt32 nLength;
long nStartShapeCont = rSt.Tell();