diff options
author | Noel Grandin <noel@peralex.com> | 2012-01-30 13:17:45 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-30 13:18:38 +0000 |
commit | 61451fec9b4ece2d2ef9d1d337dfc9e78c422d93 (patch) | |
tree | 7db6906da867d6af5a765579e9338b0838e34daf /svtools | |
parent | bbc94edb9a91b27910d43610db9994df10dd99e1 (diff) |
fdo#44981 - remove obsolete SWAPLONG macros
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/filter/sgfbram.cxx | 116 | ||||
-rw-r--r-- | svtools/source/filter/sgvmain.cxx | 100 |
2 files changed, 108 insertions, 108 deletions
diff --git a/svtools/source/filter/sgfbram.cxx b/svtools/source/filter/sgfbram.cxx index ea51f851b7fe..cdd2582f0422 100644 --- a/svtools/source/filter/sgfbram.cxx +++ b/svtools/source/filter/sgfbram.cxx @@ -45,17 +45,17 @@ SvStream& operator>>(SvStream& rIStream, SgfHeader& rHead) { rIStream.Read((char*)&rHead.Magic,SgfHeaderSize); #if defined OSL_BIGENDIAN - rHead.Magic =SWAPSHORT(rHead.Magic ); - rHead.Version=SWAPSHORT(rHead.Version); - rHead.Typ =SWAPSHORT(rHead.Typ ); - rHead.Xsize =SWAPSHORT(rHead.Xsize ); - rHead.Ysize =SWAPSHORT(rHead.Ysize ); - rHead.Xoffs =SWAPSHORT(rHead.Xoffs ); - rHead.Yoffs =SWAPSHORT(rHead.Yoffs ); - rHead.Planes =SWAPSHORT(rHead.Planes ); - rHead.SwGrCol=SWAPSHORT(rHead.SwGrCol); - rHead.OfsLo =SWAPSHORT(rHead.OfsLo ); - rHead.OfsHi =SWAPSHORT(rHead.OfsHi ); + rHead.Magic =OSL_SWAPWORD(rHead.Magic ); + rHead.Version=OSL_SWAPWORD(rHead.Version); + rHead.Typ =OSL_SWAPWORD(rHead.Typ ); + rHead.Xsize =OSL_SWAPWORD(rHead.Xsize ); + rHead.Ysize =OSL_SWAPWORD(rHead.Ysize ); + rHead.Xoffs =OSL_SWAPWORD(rHead.Xoffs ); + rHead.Yoffs =OSL_SWAPWORD(rHead.Yoffs ); + rHead.Planes =OSL_SWAPWORD(rHead.Planes ); + rHead.SwGrCol=OSL_SWAPWORD(rHead.SwGrCol); + rHead.OfsLo =OSL_SWAPWORD(rHead.OfsLo ); + rHead.OfsHi =OSL_SWAPWORD(rHead.OfsHi ); #endif return rIStream; } @@ -82,12 +82,12 @@ SvStream& operator>>(SvStream& rIStream, SgfEntry& rEntr) { rIStream.Read((char*)&rEntr.Typ,SgfEntrySize); #if defined OSL_BIGENDIAN - rEntr.Typ =SWAPSHORT(rEntr.Typ ); - rEntr.iFrei=SWAPSHORT(rEntr.iFrei); - rEntr.lFreiLo=SWAPSHORT (rEntr.lFreiLo); - rEntr.lFreiHi=SWAPSHORT (rEntr.lFreiHi); - rEntr.OfsLo=SWAPSHORT(rEntr.OfsLo); - rEntr.OfsHi=SWAPSHORT(rEntr.OfsHi); + rEntr.Typ =OSL_SWAPWORD(rEntr.Typ ); + rEntr.iFrei=OSL_SWAPWORD(rEntr.iFrei); + rEntr.lFreiLo=OSL_SWAPWORD (rEntr.lFreiLo); + rEntr.lFreiHi=OSL_SWAPWORD (rEntr.lFreiHi); + rEntr.OfsLo=OSL_SWAPWORD(rEntr.OfsLo); + rEntr.OfsHi=OSL_SWAPWORD(rEntr.OfsHi); #endif return rIStream; } @@ -105,11 +105,11 @@ SvStream& operator>>(SvStream& rIStream, SgfVector& rVect) { rIStream.Read((char*)&rVect,sizeof(rVect)); #if defined OSL_BIGENDIAN - rVect.Flag =SWAPSHORT(rVect.Flag ); - rVect.x =SWAPSHORT(rVect.x ); - rVect.y =SWAPSHORT(rVect.y ); - rVect.OfsLo=SWAPLONG (rVect.OfsLo); - rVect.OfsHi=SWAPLONG (rVect.OfsHi); + rVect.Flag =OSL_SWAPWORD(rVect.Flag ); + rVect.x =OSL_SWAPWORD(rVect.x ); + rVect.y =OSL_SWAPWORD(rVect.y ); + rVect.OfsLo=OSL_SWAPDWORD (rVect.OfsLo); + rVect.OfsHi=OSL_SWAPDWORD (rVect.OfsHi); #endif return rIStream; } @@ -123,23 +123,23 @@ SvStream& operator>>(SvStream& rIStream, SgfVector& rVect) SvStream& operator<<(SvStream& rOStream, BmpFileHeader& rHead) { #if defined OSL_BIGENDIAN - rHead.Typ =SWAPSHORT(rHead.Typ ); - rHead.SizeLo =SWAPSHORT(rHead.SizeLo ); - rHead.SizeHi =SWAPSHORT(rHead.SizeHi ); - rHead.Reserve1=SWAPSHORT(rHead.Reserve1); - rHead.Reserve2=SWAPSHORT(rHead.Reserve2); - rHead.OfsLo =SWAPSHORT(rHead.OfsLo ); - rHead.OfsHi =SWAPSHORT(rHead.OfsHi ); + rHead.Typ =OSL_SWAPWORD(rHead.Typ ); + rHead.SizeLo =OSL_SWAPWORD(rHead.SizeLo ); + rHead.SizeHi =OSL_SWAPWORD(rHead.SizeHi ); + rHead.Reserve1=OSL_SWAPWORD(rHead.Reserve1); + rHead.Reserve2=OSL_SWAPWORD(rHead.Reserve2); + rHead.OfsLo =OSL_SWAPWORD(rHead.OfsLo ); + rHead.OfsHi =OSL_SWAPWORD(rHead.OfsHi ); #endif rOStream.Write((char*)&rHead,sizeof(rHead)); #if defined OSL_BIGENDIAN - rHead.Typ =SWAPSHORT(rHead.Typ ); - rHead.SizeLo =SWAPSHORT(rHead.SizeLo ); - rHead.SizeHi =SWAPSHORT(rHead.SizeHi ); - rHead.Reserve1=SWAPSHORT(rHead.Reserve1); - rHead.Reserve2=SWAPSHORT(rHead.Reserve2); - rHead.OfsLo =SWAPSHORT(rHead.OfsLo ); - rHead.OfsHi =SWAPSHORT(rHead.OfsHi ); + rHead.Typ =OSL_SWAPWORD(rHead.Typ ); + rHead.SizeLo =OSL_SWAPWORD(rHead.SizeLo ); + rHead.SizeHi =OSL_SWAPWORD(rHead.SizeHi ); + rHead.Reserve1=OSL_SWAPWORD(rHead.Reserve1); + rHead.Reserve2=OSL_SWAPWORD(rHead.Reserve2); + rHead.OfsLo =OSL_SWAPWORD(rHead.OfsLo ); + rHead.OfsHi =OSL_SWAPWORD(rHead.OfsHi ); #endif return rOStream; } @@ -169,31 +169,31 @@ sal_uInt32 BmpFileHeader::GetOfs() SvStream& operator<<(SvStream& rOStream, BmpInfoHeader& rInfo) { #if defined OSL_BIGENDIAN - rInfo.Size =SWAPLONG (rInfo.Size ); - rInfo.Width =SWAPLONG (rInfo.Width ); - rInfo.Hight =SWAPLONG (rInfo.Hight ); - rInfo.Planes =SWAPSHORT(rInfo.Planes ); - rInfo.PixBits =SWAPSHORT(rInfo.PixBits ); - rInfo.Compress=SWAPLONG (rInfo.Compress); - rInfo.ImgSize =SWAPLONG (rInfo.ImgSize ); - rInfo.xDpmm =SWAPLONG (rInfo.xDpmm ); - rInfo.yDpmm =SWAPLONG (rInfo.yDpmm ); - rInfo.ColUsed =SWAPLONG (rInfo.ColUsed ); - rInfo.ColMust =SWAPLONG (rInfo.ColMust ); + rInfo.Size =OSL_SWAPDWORD (rInfo.Size ); + rInfo.Width =OSL_SWAPDWORD (rInfo.Width ); + rInfo.Hight =OSL_SWAPDWORD (rInfo.Hight ); + rInfo.Planes =OSL_SWAPWORD(rInfo.Planes ); + rInfo.PixBits =OSL_SWAPWORD(rInfo.PixBits ); + rInfo.Compress=OSL_SWAPDWORD (rInfo.Compress); + rInfo.ImgSize =OSL_SWAPDWORD (rInfo.ImgSize ); + rInfo.xDpmm =OSL_SWAPDWORD (rInfo.xDpmm ); + rInfo.yDpmm =OSL_SWAPDWORD (rInfo.yDpmm ); + rInfo.ColUsed =OSL_SWAPDWORD (rInfo.ColUsed ); + rInfo.ColMust =OSL_SWAPDWORD (rInfo.ColMust ); #endif rOStream.Write((char*)&rInfo,sizeof(rInfo)); #if defined OSL_BIGENDIAN - rInfo.Size =SWAPLONG (rInfo.Size ); - rInfo.Width =SWAPLONG (rInfo.Width ); - rInfo.Hight =SWAPLONG (rInfo.Hight ); - rInfo.Planes =SWAPSHORT(rInfo.Planes ); - rInfo.PixBits =SWAPSHORT(rInfo.PixBits ); - rInfo.Compress=SWAPLONG (rInfo.Compress); - rInfo.ImgSize =SWAPLONG (rInfo.ImgSize ); - rInfo.xDpmm =SWAPLONG (rInfo.xDpmm ); - rInfo.yDpmm =SWAPLONG (rInfo.yDpmm ); - rInfo.ColUsed =SWAPLONG (rInfo.ColUsed ); - rInfo.ColMust =SWAPLONG (rInfo.ColMust ); + rInfo.Size =OSL_SWAPDWORD (rInfo.Size ); + rInfo.Width =OSL_SWAPDWORD (rInfo.Width ); + rInfo.Hight =OSL_SWAPDWORD (rInfo.Hight ); + rInfo.Planes =OSL_SWAPWORD(rInfo.Planes ); + rInfo.PixBits =OSL_SWAPWORD(rInfo.PixBits ); + rInfo.Compress=OSL_SWAPDWORD (rInfo.Compress); + rInfo.ImgSize =OSL_SWAPDWORD (rInfo.ImgSize ); + rInfo.xDpmm =OSL_SWAPDWORD (rInfo.xDpmm ); + rInfo.yDpmm =OSL_SWAPDWORD (rInfo.yDpmm ); + rInfo.ColUsed =OSL_SWAPDWORD (rInfo.ColUsed ); + rInfo.ColMust =OSL_SWAPDWORD (rInfo.ColMust ); #endif return rOStream; } diff --git a/svtools/source/filter/sgvmain.cxx b/svtools/source/filter/sgvmain.cxx index a220a228969e..bbfda53271e3 100644 --- a/svtools/source/filter/sgvmain.cxx +++ b/svtools/source/filter/sgvmain.cxx @@ -39,50 +39,50 @@ #include <unotools/ucbstreamhelper.hxx> #define SWAPPOINT(p) { \ - p.x=SWAPSHORT(p.x); \ - p.y=SWAPSHORT(p.y); } + p.x=OSL_SWAPWORD(p.x); \ + p.y=OSL_SWAPWORD(p.y); } #define SWAPPAGE(p) { \ - p.Next =SWAPLONG (p.Next ); \ - p.nList =SWAPLONG (p.nList ); \ - p.ListEnd=SWAPLONG (p.ListEnd); \ - p.Paper.Size.x=SWAPSHORT(p.Paper.Size.x); \ - p.Paper.Size.y=SWAPSHORT(p.Paper.Size.y); \ - p.Paper.RandL =SWAPSHORT(p.Paper.RandL ); \ - p.Paper.RandR =SWAPSHORT(p.Paper.RandR ); \ - p.Paper.RandO =SWAPSHORT(p.Paper.RandO ); \ - p.Paper.RandU =SWAPSHORT(p.Paper.RandU ); \ + p.Next =OSL_SWAPDWORD (p.Next ); \ + p.nList =OSL_SWAPDWORD (p.nList ); \ + p.ListEnd=OSL_SWAPDWORD (p.ListEnd); \ + p.Paper.Size.x=OSL_SWAPWORD(p.Paper.Size.x); \ + p.Paper.Size.y=OSL_SWAPWORD(p.Paper.Size.y); \ + p.Paper.RandL =OSL_SWAPWORD(p.Paper.RandL ); \ + p.Paper.RandR =OSL_SWAPWORD(p.Paper.RandR ); \ + p.Paper.RandO =OSL_SWAPWORD(p.Paper.RandO ); \ + p.Paper.RandU =OSL_SWAPWORD(p.Paper.RandU ); \ SWAPPOINT(p.U); \ sal_uInt16 iTemp; \ for (iTemp=0;iTemp<20;iTemp++) { \ - rPage.HlpLnH[iTemp]=SWAPSHORT(rPage.HlpLnH[iTemp]); \ - rPage.HlpLnV[iTemp]=SWAPSHORT(rPage.HlpLnV[iTemp]); }} + rPage.HlpLnH[iTemp]=OSL_SWAPWORD(rPage.HlpLnH[iTemp]); \ + rPage.HlpLnV[iTemp]=OSL_SWAPWORD(rPage.HlpLnV[iTemp]); }} #define SWAPOBJK(o) { \ - o.Last =SWAPLONG (o.Last ); \ - o.Next =SWAPLONG (o.Next ); \ - o.MemSize =SWAPSHORT(o.MemSize ); \ + o.Last =OSL_SWAPDWORD (o.Last ); \ + o.Next =OSL_SWAPDWORD (o.Next ); \ + o.MemSize =OSL_SWAPWORD(o.MemSize ); \ SWAPPOINT(o.ObjMin); \ SWAPPOINT(o.ObjMax); } #define SWAPLINE(l) { \ - l.LMSize=SWAPSHORT(l.LMSize); \ - l.LDicke=SWAPSHORT(l.LDicke); } + l.LMSize=OSL_SWAPWORD(l.LMSize); \ + l.LDicke=OSL_SWAPWORD(l.LDicke); } #define SWAPAREA(a) { \ - a.FDummy2=SWAPSHORT(a.FDummy2); \ - a.FMuster=SWAPSHORT(a.FMuster); } + a.FDummy2=OSL_SWAPWORD(a.FDummy2); \ + a.FMuster=OSL_SWAPWORD(a.FMuster); } #define SWAPTEXT(t) { \ SWAPLINE(t.L); \ SWAPAREA(t.F); \ - t.FontLo =SWAPSHORT(t.FontLo ); \ - t.FontHi =SWAPSHORT(t.FontHi ); \ - t.Grad =SWAPSHORT(t.Grad ); \ - t.Breite =SWAPSHORT(t.Breite ); \ - t.Schnitt=SWAPSHORT(t.Schnitt); \ - t.LnFeed =SWAPSHORT(t.LnFeed ); \ - t.Slant =SWAPSHORT(t.Slant ); \ + t.FontLo =OSL_SWAPWORD(t.FontLo ); \ + t.FontHi =OSL_SWAPWORD(t.FontHi ); \ + t.Grad =OSL_SWAPWORD(t.Grad ); \ + t.Breite =OSL_SWAPWORD(t.Breite ); \ + t.Schnitt=OSL_SWAPWORD(t.Schnitt); \ + t.LnFeed =OSL_SWAPWORD(t.LnFeed ); \ + t.Slant =OSL_SWAPWORD(t.Slant ); \ SWAPLINE(t.ShdL); \ SWAPAREA(t.ShdF); \ SWAPPOINT(t.ShdVers); \ @@ -223,9 +223,9 @@ SvStream& operator>>(SvStream& rInp, RectType& rRect) SWAPAREA (rRect.F); SWAPPOINT(rRect.Pos1); SWAPPOINT(rRect.Pos2); - rRect.Radius =SWAPSHORT(rRect.Radius ); - rRect.DrehWink=SWAPSHORT(rRect.DrehWink); - rRect.Slant =SWAPSHORT(rRect.Slant ); + rRect.Radius =OSL_SWAPWORD(rRect.Radius ); + rRect.DrehWink=OSL_SWAPWORD(rRect.DrehWink); + rRect.Slant =OSL_SWAPWORD(rRect.Slant ); #endif return rInp; } @@ -236,7 +236,7 @@ SvStream& operator>>(SvStream& rInp, PolyType& rPoly) SWAPOBJK (rPoly); SWAPLINE (rPoly.L); SWAPAREA (rPoly.F); - // rPoly.EckP=SWAPLONG(rPoly.EckP); + // rPoly.EckP=OSL_SWAPDWORD(rPoly.EckP); #endif return rInp; } @@ -247,7 +247,7 @@ SvStream& operator>>(SvStream& rInp, SplnType& rSpln) SWAPOBJK (rSpln); SWAPLINE (rSpln.L); SWAPAREA (rSpln.F); - // rSpln.EckP=SWAPLONG(rSpln.EckP); + // rSpln.EckP=OSL_SWAPDWORD(rSpln.EckP); #endif return rInp; } @@ -260,9 +260,9 @@ SvStream& operator>>(SvStream& rInp, CircType& rCirc) SWAPAREA (rCirc.F); SWAPPOINT(rCirc.Radius); SWAPPOINT(rCirc.Center); - rCirc.DrehWink =SWAPSHORT(rCirc.DrehWink ); - rCirc.StartWink=SWAPSHORT(rCirc.StartWink); - rCirc.RelWink =SWAPSHORT(rCirc.RelWink ); + rCirc.DrehWink =OSL_SWAPWORD(rCirc.DrehWink ); + rCirc.StartWink=OSL_SWAPWORD(rCirc.StartWink); + rCirc.RelWink =OSL_SWAPWORD(rCirc.RelWink ); #endif return rInp; } @@ -274,14 +274,14 @@ SvStream& operator>>(SvStream& rInp, TextType& rText) SWAPTEXT (rText.T); SWAPPOINT(rText.Pos1); SWAPPOINT(rText.Pos2); - rText.TopOfs =SWAPSHORT(rText.TopOfs ); - rText.DrehWink=SWAPSHORT(rText.DrehWink); - rText.BoxSlant=SWAPSHORT(rText.BoxSlant); - rText.BufSize =SWAPSHORT(rText.BufSize ); - //rText.Buf =SWAPLONG (rText.Buf ); - //rText.Ext =SWAPLONG (rText.Ext ); + rText.TopOfs =OSL_SWAPWORD(rText.TopOfs ); + rText.DrehWink=OSL_SWAPWORD(rText.DrehWink); + rText.BoxSlant=OSL_SWAPWORD(rText.BoxSlant); + rText.BufSize =OSL_SWAPWORD(rText.BufSize ); + //rText.Buf =OSL_SWAPDWORD (rText.Buf ); + //rText.Ext =OSL_SWAPDWORD (rText.Ext ); SWAPPOINT(rText.FitSize); - rText.FitBreit=SWAPSHORT(rText.FitBreit); + rText.FitBreit=OSL_SWAPWORD(rText.FitBreit); #endif rText.Buffer=NULL; return rInp; @@ -294,8 +294,8 @@ SvStream& operator>>(SvStream& rInp, BmapType& rBmap) SWAPAREA (rBmap.F); SWAPPOINT(rBmap.Pos1); SWAPPOINT(rBmap.Pos2); - rBmap.DrehWink=SWAPSHORT(rBmap.DrehWink); - rBmap.Slant =SWAPSHORT(rBmap.Slant ); + rBmap.DrehWink=OSL_SWAPWORD(rBmap.DrehWink); + rBmap.Slant =OSL_SWAPWORD(rBmap.Slant ); SWAPPOINT(rBmap.PixSize); #endif return rInp; @@ -305,12 +305,12 @@ SvStream& operator>>(SvStream& rInp, GrupType& rGrup) rInp.Read((char*)&rGrup.Last,GrupSize); #if defined OSL_BIGENDIAN SWAPOBJK (rGrup); - rGrup.SbLo =SWAPSHORT(rGrup.SbLo ); - rGrup.SbHi =SWAPSHORT(rGrup.SbHi ); - rGrup.UpLo =SWAPSHORT(rGrup.UpLo ); - rGrup.UpHi =SWAPSHORT(rGrup.UpHi ); - rGrup.ChartSize=SWAPSHORT(rGrup.ChartSize); - rGrup.ChartPtr =SWAPLONG (rGrup.ChartPtr ); + rGrup.SbLo =OSL_SWAPWORD(rGrup.SbLo ); + rGrup.SbHi =OSL_SWAPWORD(rGrup.SbHi ); + rGrup.UpLo =OSL_SWAPWORD(rGrup.UpLo ); + rGrup.UpHi =OSL_SWAPWORD(rGrup.UpHi ); + rGrup.ChartSize=OSL_SWAPWORD(rGrup.ChartSize); + rGrup.ChartPtr =OSL_SWAPDWORD (rGrup.ChartPtr ); #endif return rInp; } |