Skip to content

C
core
Kaydet (Commit) e2655495 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert nDrawingContainerId to sal_uInt16 

which is all that can be stored anyhow

Change-Id: Iaec28a97ed25004715accafc0cbd4bd620bfbba9
Reviewed-on: https://gerrit.libreoffice.org/44360Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Tested-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 4f5469ed
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
filter/source/msfilter/msdffimp.cxx
Dosyayı görüntüle @ e2655495
......@@ -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();
......
include/filter/msfilter/msdffimp.hxx
Dosyayı görüntüle @ e2655495
......@@ -449,15 +449,15 @@ protected:
// objects in different drawing containers.
void GetDrawingContainerData( SvStream& rSt,
sal_uLong nLenDg,
const unsigned long nDrawingContainerId );
sal_uInt16 nDrawingContainerId );
bool GetShapeGroupContainerData( SvStream& rSt,
sal_uLong nLenShapeGroupCont,
bool bPatriarch,
const unsigned long nDrawingContainerId );
sal_uInt16 nDrawingContainerId );
bool GetShapeContainerData( SvStream& rSt,
sal_uLong nLenShapeCont,
sal_uLong nPosGroup,
const unsigned long nDrawingContainerId );
sal_uInt16 nDrawingContainerId );
SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& );
// #i32596# - pass <nCalledByGroup> to method
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment