summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/ww8graf2.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ww8/ww8graf2.cxx')
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx72
1 files changed, 36 insertions, 36 deletions
diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx
index 7bfa32992f9c..6303e9b8c6e6 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -72,7 +72,7 @@ wwZOrderer::wwZOrderer(const sw::util::SetLayer &rSetLayer, SdrPage* pDrawPg,
ASSERT(mpDrawPg,"Missing draw page impossible!");
}
-void wwZOrderer::InsideEscher(ULONG nSpId)
+void wwZOrderer::InsideEscher(sal_uLong nSpId)
{
maIndexes.push(GetEscherObjectIdx(nSpId));
}
@@ -84,15 +84,15 @@ void wwZOrderer::OutsideEscher()
// --> OD 2004-12-13 #117915# - consider new parameter <_bInHeaderFooter>
void wwZOrderer::InsertEscherObject( SdrObject* pObject,
- ULONG nSpId,
+ sal_uLong nSpId,
const bool _bInHeaderFooter )
{
- ULONG nInsertPos = GetEscherObjectPos( nSpId, _bInHeaderFooter );
+ sal_uLong nInsertPos = GetEscherObjectPos( nSpId, _bInHeaderFooter );
// <--
InsertObject(pObject, nInsertPos + mnNoInitialObjects + mnInlines);
}
-wwZOrderer::myeiter wwZOrderer::MapEscherIdxToIter(ULONG nIdx)
+wwZOrderer::myeiter wwZOrderer::MapEscherIdxToIter(sal_uLong nIdx)
{
myeiter aIter = maEscherLayer.begin();
myeiter aEnd = maEscherLayer.end();
@@ -105,12 +105,12 @@ wwZOrderer::myeiter wwZOrderer::MapEscherIdxToIter(ULONG nIdx)
return aIter;
}
-USHORT wwZOrderer::GetEscherObjectIdx(ULONG nSpId)
+sal_uInt16 wwZOrderer::GetEscherObjectIdx(sal_uLong nSpId)
{
- USHORT nFound=0;
- USHORT nShapeCount = mpShapeOrders ? mpShapeOrders->Count() : 0;
+ sal_uInt16 nFound=0;
+ sal_uInt16 nShapeCount = mpShapeOrders ? mpShapeOrders->Count() : 0;
// First, find out what position this shape is in in the Escher order.
- for (USHORT nShapePos=0; nShapePos < nShapeCount; nShapePos++)
+ for (sal_uInt16 nShapePos=0; nShapePos < nShapeCount; nShapePos++)
{
const SvxMSDffShapeOrder *pOrder = mpShapeOrders->GetObject(nShapePos);
if (pOrder->nShapeId == nSpId)
@@ -123,7 +123,7 @@ USHORT wwZOrderer::GetEscherObjectIdx(ULONG nSpId)
}
// --> OD 2004-12-13 #117915# - consider new parameter <_bInHeaderFooter>
-ULONG wwZOrderer::GetEscherObjectPos( ULONG nSpId,
+sal_uLong wwZOrderer::GetEscherObjectPos( sal_uLong nSpId,
const bool _bInHeaderFooter )
{
/*
@@ -131,12 +131,12 @@ ULONG wwZOrderer::GetEscherObjectPos( ULONG nSpId,
the actual ordering that should be used when inserting them into the
document.
*/
- USHORT nFound = GetEscherObjectIdx(nSpId);
+ sal_uInt16 nFound = GetEscherObjectIdx(nSpId);
// Match the ordering position from the ShapeOrders to the ordering of all
// objects in the document, there is a complexity when escherobjects
// contain inlines objects, we need to consider thsose as part of the
// escher count
- ULONG nRet=0;
+ sal_uLong nRet=0;
myeiter aIter = maEscherLayer.begin();
myeiter aEnd = maEscherLayer.end();
// --> OD 2004-12-13 #117915# - skip objects in page header|footer, if
@@ -177,7 +177,7 @@ ULONG wwZOrderer::GetEscherObjectPos( ULONG nSpId,
// einem VarArr
void wwZOrderer::InsertDrawingObject(SdrObject* pObj, short nWwHeight)
{
- ULONG nPos = GetDrawingObjectPos(nWwHeight);
+ sal_uLong nPos = GetDrawingObjectPos(nWwHeight);
if (nWwHeight & 0x2000) // Heaven ?
maSetLayer.SendObjectToHeaven(*pObj);
else
@@ -198,10 +198,10 @@ void wwZOrderer::InsertTextLayerObject(SdrObject* pObject)
{
//If we are inside an escher objects, place us just after that
//escher obj, and increment its inline count
- USHORT nIdx = maIndexes.top();
+ sal_uInt16 nIdx = maIndexes.top();
myeiter aEnd = MapEscherIdxToIter(nIdx);
- ULONG nInsertPos=0;
+ sal_uLong nInsertPos=0;
myeiter aIter = maEscherLayer.begin();
while (aIter != aEnd)
{
@@ -226,7 +226,7 @@ void wwZOrderer::InsertTextLayerObject(SdrObject* pObject)
// Der Offset bei Datei in bestehendes Dokument mit Grafiklayer einfuegen
// muss der Aufrufer den Index um mnNoInitialObjects erhoeht werden, damit die
// neuen Objekte am Ende landen ( Einfuegen ist dann schneller )
-ULONG wwZOrderer::GetDrawingObjectPos(short nWwHeight)
+sal_uLong wwZOrderer::GetDrawingObjectPos(short nWwHeight)
{
myditer aIter = maDrawHeight.begin();
myditer aEnd = maDrawHeight.end();
@@ -242,7 +242,7 @@ ULONG wwZOrderer::GetDrawingObjectPos(short nWwHeight)
return std::distance(maDrawHeight.begin(), aIter);
}
-bool wwZOrderer::InsertObject(SdrObject* pObject, ULONG nPos)
+bool wwZOrderer::InsertObject(SdrObject* pObject, sal_uLong nPos)
{
if (!pObject->IsInserted())
{
@@ -263,11 +263,11 @@ bool SwWW8ImplReader::GetPictGrafFromStream(Graphic& rGraphic, SvStream& rSrc)
}
bool SwWW8ImplReader::ReadGrafFile(String& rFileName, Graphic*& rpGraphic,
- const WW8_PIC& rPic, SvStream* pSt, ULONG nFilePos, bool* pbInDoc)
+ const WW8_PIC& rPic, SvStream* pSt, sal_uLong nFilePos, bool* pbInDoc)
{ // Grafik in File schreiben
*pbInDoc = true; // default
- ULONG nPosFc = nFilePos + rPic.cbHeader;
+ sal_uLong nPosFc = nFilePos + rPic.cbHeader;
switch (rPic.MFP.mm)
{
@@ -334,7 +334,7 @@ able to calculate the proper prefsize (especially if the wmf fileheader was miss
struct WW8PicDesc
{
- INT16 nCL, nCR, nCT, nCB;
+ sal_Int16 nCL, nCR, nCT, nCB;
long nWidth, nHeight;
WW8PicDesc( const WW8_PIC& rPic );
@@ -388,14 +388,14 @@ SwFlyFrmFmt* SwWW8ImplReader::MakeGrafNotInCntnt(const WW8PicDesc& rPD,
const Graphic* pGraph, const String& rFileName, const SfxItemSet& rGrfSet)
{
- UINT32 nWidth = rPD.nWidth;
- UINT32 nHeight = rPD.nHeight;
+ sal_uInt32 nWidth = rPD.nWidth;
+ sal_uInt32 nHeight = rPD.nHeight;
// Vertikale Verschiebung durch Zeilenabstand
- INT32 nNetHeight = nHeight + rPD.nCT + rPD.nCB;
+ sal_Int32 nNetHeight = nHeight + rPD.nCT + rPD.nCB;
if( pSFlyPara->nLineSpace && pSFlyPara->nLineSpace > nNetHeight )
pSFlyPara->nYPos =
- (USHORT)( pSFlyPara->nYPos + pSFlyPara->nLineSpace - nNetHeight );
+ (sal_uInt16)( pSFlyPara->nYPos + pSFlyPara->nLineSpace - nNetHeight );
WW8FlySet aFlySet(*this, pWFlyPara, pSFlyPara, true);
@@ -445,7 +445,7 @@ SwFrmFmt* SwWW8ImplReader::MakeGrafInCntnt(const WW8_PIC& rPic,
}
SwFrmFmt* SwWW8ImplReader::ImportGraf1(WW8_PIC& rPic, SvStream* pSt,
- ULONG nFilePos )
+ sal_uLong nFilePos )
{
SwFrmFmt* pRet = 0;
if( pSt->IsEof() || rPic.fError || rPic.MFP.mm == 99 )
@@ -520,7 +520,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
Wir mappen ansonsten die Variable pDataStream auf pStream.
*/
- ULONG nOldPos = pDataStream->Tell();
+ sal_uLong nOldPos = pDataStream->Tell();
WW8_PIC aPic;
pDataStream->Seek( nPicLocFc );
PicRead( pDataStream, &aPic, bVer67);
@@ -586,7 +586,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
if (0x66 == aPic.MFP.mm)
{
//These ones have names prepended
- BYTE nNameLen=0;
+ sal_uInt8 nNameLen=0;
*pDataStream >> nNameLen;
pDataStream->SeekRel( nNameLen );
}
@@ -676,7 +676,7 @@ SwFrmFmt* SwWW8ImplReader::ImportGraf(SdrTextObj* pTextObj,
ReplaceObj(*pTextObj, *pObject);
else
{
- if (UINT16(OBJ_OLE2) == pObject->GetObjIdentifier())
+ if (sal_uInt16(OBJ_OLE2) == pObject->GetObjIdentifier())
{
// the size from BLIP, if there is any, should be already set
pRet = InsertOle(*((SdrOle2Obj*)pObject), aAttrSet, aGrSet);
@@ -766,7 +766,7 @@ void WW8PicShadowToReal( WW8_PIC_SHADOW * pPicS, WW8_PIC * pPic )
pPic->MFP.xExt = SVBT16ToShort( pPicS->MFP.xExt );
pPic->MFP.yExt = SVBT16ToShort( pPicS->MFP.yExt );
pPic->MFP.hMF = SVBT16ToShort( pPicS->MFP.hMF );
- for( USHORT i = 0; i < 14 ; i++ )
+ for( sal_uInt16 i = 0; i < 14 ; i++ )
pPic->rcWinMF[i] = SVBT8ToByte( pPicS->rcWinMF[i] );
pPic->dxaGoal = SVBT16ToShort( pPicS->dxaGoal );
pPic->dyaGoal = SVBT16ToShort( pPicS->dyaGoal );
@@ -791,13 +791,13 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA )
//long nYaTop; //top of rectangle enclosing shape relative to the origin of the shape
//long nXaRight; //right of rectangle enclosing shape relative to the origin of the shape
//long nYaBottom;//bottom of the rectangle enclosing shape relative to the origin of the shape
- //USHORT bHdr:1;
- //USHORT nbx:2;
- //USHORT nby:2;
- //USHORT nwr:4;
- //USHORT nwrk:4;
- //USHORT bRcaSimple:1;
- //USHORT bAnchorLock:1;
+ //sal_uInt16 bHdr:1;
+ //sal_uInt16 nbx:2;
+ //sal_uInt16 nby:2;
+ //sal_uInt16 nwr:4;
+ //sal_uInt16 nwrk:4;
+ //sal_uInt16 bRcaSimple:1;
+ //sal_uInt16 bAnchorLock:1;
//long nTxbx; //count of textboxes in shape (undo doc only)
@@ -807,7 +807,7 @@ void WW8FSPAShadowToReal( WW8_FSPA_SHADOW * pFSPAS, WW8_FSPA * pFSPA )
pFSPA->nXaRight = SVBT32ToUInt32( pFSPAS->nXaRight );
pFSPA->nYaBottom = SVBT32ToUInt32( pFSPAS->nYaBottom );
- USHORT nBits = SVBT16ToShort( pFSPAS->aBits1 );
+ sal_uInt16 nBits = SVBT16ToShort( pFSPAS->aBits1 );
pFSPA->bHdr = 0 != ( nBits & 0x0001 );
pFSPA->nbx = ( nBits & 0x0006 ) >> 1;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 10:15:48 +0000