diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-05-23 21:38:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-23 21:43:00 +0100 |
commit | b4fb7a437bb0ce987702b12008737756623618ac (patch) | |
tree | ccfbcf621c909487fbed64d07772e84d43c9d2a0 /lotuswordpro/source/filter/lwpdrawobj.cxx | |
parent | ee263e53c67a469c64cfcbbd1d0668ce8719190e (diff) |
fix up some more endian
Diffstat (limited to 'lotuswordpro/source/filter/lwpdrawobj.cxx')
-rw-r--r-- | lotuswordpro/source/filter/lwpdrawobj.cxx | 216 |
1 files changed, 107 insertions, 109 deletions
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index ac1f7a67f083..b896bb29921c 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -107,13 +107,13 @@ void LwpDrawObj::ReadObjHeaderRecord() m_pStream->SeekRel(1); //record Length - m_pStream->Read(&m_aObjHeader.nRecLen, sizeof(m_aObjHeader.nRecLen)); + *m_pStream >> m_aObjHeader.nRecLen; //boundrect - m_pStream->Read(&m_aObjHeader.nLeft, sizeof(m_aObjHeader.nLeft)); - m_pStream->Read(&m_aObjHeader.nTop, sizeof(m_aObjHeader.nTop)); - m_pStream->Read(&m_aObjHeader.nRight, sizeof(m_aObjHeader.nRight)); - m_pStream->Read(&m_aObjHeader.nBottom, sizeof(m_aObjHeader.nBottom)); + *m_pStream >> m_aObjHeader.nLeft; + *m_pStream >> m_aObjHeader.nTop; + *m_pStream >> m_aObjHeader.nRight; + *m_pStream >> m_aObjHeader.nBottom; //nextObj, prevObj m_pStream->SeekRel(4); @@ -129,30 +129,31 @@ void LwpDrawObj::ReadClosedObjStyle() m_pStream->SeekRel(8); } - m_pStream->Read(&m_aClosedObjStyleRec.nLineWidth, sizeof(m_aClosedObjStyleRec.nLineWidth)); - m_pStream->Read(&m_aClosedObjStyleRec.nLineStyle, sizeof(m_aClosedObjStyleRec.nLineStyle)); + *m_pStream >> m_aClosedObjStyleRec.nLineWidth; + *m_pStream >> m_aClosedObjStyleRec.nLineStyle; // pen color - m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.nR, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.nG, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.nB, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aPenColor.unused, 1); + *m_pStream >> m_aClosedObjStyleRec.aPenColor.nR; + *m_pStream >> m_aClosedObjStyleRec.aPenColor.nG; + *m_pStream >> m_aClosedObjStyleRec.aPenColor.nB; + *m_pStream >> m_aClosedObjStyleRec.aPenColor.unused; // foreground color - m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.nR, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.nG, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.nB, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aForeColor.unused, 1); + *m_pStream >> m_aClosedObjStyleRec.aForeColor.nR; + *m_pStream >> m_aClosedObjStyleRec.aForeColor.nG; + *m_pStream >> m_aClosedObjStyleRec.aForeColor.nB; + *m_pStream >> m_aClosedObjStyleRec.aForeColor.unused; // background color - m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.nR, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.nG, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.nB, 1); - m_pStream->Read(&m_aClosedObjStyleRec.aBackColor.unused, 1); + *m_pStream >> m_aClosedObjStyleRec.aBackColor.nR; + *m_pStream >> m_aClosedObjStyleRec.aBackColor.nG; + *m_pStream >> m_aClosedObjStyleRec.aBackColor.nB; + *m_pStream >> m_aClosedObjStyleRec.aBackColor.unused; // fill style - m_pStream->Read(&m_aClosedObjStyleRec.nFillType, sizeof(m_aClosedObjStyleRec.nFillType)); - m_pStream->Read(m_aClosedObjStyleRec.pFillPattern, sizeof(m_aClosedObjStyleRec.pFillPattern)); + *m_pStream >> m_aClosedObjStyleRec.nFillType; + m_pStream->Read(m_aClosedObjStyleRec.pFillPattern, + sizeof(m_aClosedObjStyleRec.pFillPattern)); } /** @@ -421,18 +422,18 @@ LwpDrawLine::LwpDrawLine(SvStream * pStream, DrawingOffsetAndScale* pTransData) */ void LwpDrawLine::Read() { - m_pStream->Read(&m_aLineRec.nStartX, sizeof(m_aLineRec.nStartX)); - m_pStream->Read(&m_aLineRec.nStartY, sizeof(m_aLineRec.nStartY)); - m_pStream->Read(&m_aLineRec.nEndX, sizeof(m_aLineRec.nEndX)); - m_pStream->Read(&m_aLineRec.nEndY, sizeof(m_aLineRec.nEndY)); - m_pStream->Read(&m_aLineRec.nLineWidth, sizeof(m_aLineRec.nLineWidth)); - m_pStream->Read(&m_aLineRec.nLineEnd,sizeof(m_aLineRec.nLineEnd)); - m_pStream->Read(&m_aLineRec.nLineStyle, sizeof(m_aLineRec.nLineStyle)); + *m_pStream >> m_aLineRec.nStartX; + *m_pStream >> m_aLineRec.nStartY; + *m_pStream >> m_aLineRec.nEndX; + *m_pStream >> m_aLineRec.nEndY; + *m_pStream >> m_aLineRec.nLineWidth; + *m_pStream >> m_aLineRec.nLineEnd; + *m_pStream >> m_aLineRec.nLineStyle; - m_pStream->Read(&m_aLineRec.aPenColor.nR, 1); - m_pStream->Read(&m_aLineRec.aPenColor.nG, 1); - m_pStream->Read(&m_aLineRec.aPenColor.nB, 1); - m_pStream->Read(&m_aLineRec.aPenColor.unused, 1); + *m_pStream >> m_aLineRec.aPenColor.nR; + *m_pStream >> m_aLineRec.aPenColor.nG; + *m_pStream >> m_aLineRec.aPenColor.nB; + *m_pStream >> m_aLineRec.aPenColor.unused; } rtl::OUString LwpDrawLine::RegisterStyle() @@ -496,22 +497,22 @@ LwpDrawPolyLine::~LwpDrawPolyLine() */ void LwpDrawPolyLine::Read() { - m_pStream->Read(&m_aPolyLineRec.nLineWidth, 1); - m_pStream->Read(&m_aPolyLineRec.nLineEnd, 1); - m_pStream->Read(&m_aPolyLineRec.nLineStyle, 1); - m_pStream->Read(&m_aPolyLineRec.aPenColor.nR, 1); - m_pStream->Read(&m_aPolyLineRec.aPenColor.nG, 1); - m_pStream->Read(&m_aPolyLineRec.aPenColor.nB, 1); - m_pStream->Read(&m_aPolyLineRec.aPenColor.unused, 1); - m_pStream->Read(&m_aPolyLineRec.nNumPoints, 2); + *m_pStream >> m_aPolyLineRec.nLineWidth; + *m_pStream >> m_aPolyLineRec.nLineEnd; + *m_pStream >> m_aPolyLineRec.nLineStyle; + *m_pStream >> m_aPolyLineRec.aPenColor.nR; + *m_pStream >> m_aPolyLineRec.aPenColor.nG; + *m_pStream >> m_aPolyLineRec.aPenColor.nB; + *m_pStream >> m_aPolyLineRec.aPenColor.unused; + *m_pStream >> m_aPolyLineRec.nNumPoints; - m_pVector= new SdwPoint [m_aPolyLineRec.nNumPoints]; + m_pVector= new SdwPoint [m_aPolyLineRec.nNumPoints]; - for (sal_uInt16 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++) - { - m_pStream->Read(&m_pVector[nC].x,2); - m_pStream->Read(&m_pVector[nC].y,2); - } + for (sal_uInt16 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++) + { + *m_pStream >> m_pVector[nC].x; + *m_pStream >> m_pVector[nC].y; + } } rtl::OUString LwpDrawPolyLine::RegisterStyle() @@ -583,14 +584,14 @@ LwpDrawPolygon::~LwpDrawPolygon() void LwpDrawPolygon::Read() { this->ReadClosedObjStyle(); - m_pStream->Read(&m_nNumPoints, sizeof(m_nNumPoints)); + *m_pStream >> m_nNumPoints; m_pVector = new SdwPoint [m_nNumPoints]; for (sal_uInt16 nC = 0; nC < m_nNumPoints; nC++) { - m_pStream->Read(&m_pVector[nC].x, 2); - m_pStream->Read(&m_pVector[nC].y, 2); + *m_pStream >> m_pVector[nC].x; + *m_pStream >> m_pVector[nC].y; } } @@ -656,7 +657,6 @@ void LwpDrawRectangle::Read() { this->ReadClosedObjStyle(); - sal_uInt8 nPointsCount; if (m_eType == OT_RNDRECT) { @@ -670,8 +670,8 @@ void LwpDrawRectangle::Read() for (sal_uInt8 nC = 0; nC < nPointsCount; nC++) { - m_pStream->Read(&m_aVector[nC].x,2); - m_pStream->Read(&m_aVector[nC].y,2); + *m_pStream >> m_aVector[nC].x; + *m_pStream >> m_aVector[nC].y; } } @@ -829,8 +829,8 @@ void LwpDrawEllipse::Read() for (sal_uInt8 nC = 0; nC < 13; nC++) { - m_pStream->Read(&m_aVector[nC].x,2); - m_pStream->Read(&m_aVector[nC].y,2); + *m_pStream >> m_aVector[nC].x; + *m_pStream >> m_aVector[nC].y; } } @@ -898,18 +898,18 @@ void LwpDrawArc::Read() { m_pStream->SeekRel(16);// arcRect, startPt, endPt - m_pStream->Read(&m_aArcRec.nLineWidth, sizeof(m_aArcRec.nLineWidth)); - m_pStream->Read(&m_aArcRec.nLineStyle, sizeof(m_aArcRec.nLineStyle)); - m_pStream->Read(&m_aArcRec.aPenColor.nR, 1); - m_pStream->Read(&m_aArcRec.aPenColor.nG, 1); - m_pStream->Read(&m_aArcRec.aPenColor.nB, 1); - m_pStream->Read(&m_aArcRec.aPenColor.unused, 1); - m_pStream->Read(&m_aArcRec.nLineEnd, sizeof(m_aArcRec.nLineEnd)); + *m_pStream >> m_aArcRec.nLineWidth; + *m_pStream >> m_aArcRec.nLineStyle; + *m_pStream >> m_aArcRec.aPenColor.nR; + *m_pStream >> m_aArcRec.aPenColor.nG; + *m_pStream >> m_aArcRec.aPenColor.nB; + *m_pStream >> m_aArcRec.aPenColor.unused; + *m_pStream >> m_aArcRec.nLineEnd; for (sal_uInt8 nC = 0; nC < 4; nC++) { - m_pStream->Read(&m_aVector[nC].x,2); - m_pStream->Read(&m_aVector[nC].y,2); + *m_pStream >> m_aVector[nC].x; + *m_pStream >> m_aVector[nC].y; } } @@ -1020,43 +1020,41 @@ void LwpDrawTextBox::SetFontStyle(XFFont* pFont, SdwTextBoxRecord* pRec) */ void LwpDrawTextBox::Read() { - m_pStream->Read(&m_aVector.x, 2); - m_pStream->Read(&m_aVector.y, 2); - m_pStream->Read(&m_aTextRec.nTextWidth, sizeof(m_aTextRec.nTextWidth)); + *m_pStream >> m_aVector.x; + *m_pStream >> m_aVector.y; + *m_pStream >> m_aTextRec.nTextWidth; if (m_aTextRec.nTextWidth == 0) - { m_aTextRec.nTextWidth = 1; - } - m_pStream->Read(&m_aTextRec.nTextHeight, sizeof(m_aTextRec.nTextHeight)); + *m_pStream >> m_aTextRec.nTextHeight; m_pStream->Read(m_aTextRec.tmpTextFaceName, DRAW_FACESIZE); m_pStream->SeekRel(1);// PitchAndFamily - m_pStream->Read(&m_aTextRec.nTextSize, sizeof(m_aTextRec.nTextSize)); + *m_pStream >> m_aTextRec.nTextSize; if (m_aTextRec.nTextSize < 0) m_aTextRec.nTextSize = -m_aTextRec.nTextSize; //color - m_pStream->Read(&m_aTextRec.aTextColor.nR, 1); - m_pStream->Read(&m_aTextRec.aTextColor.nG, 1); - m_pStream->Read(&m_aTextRec.aTextColor.nB, 1); - m_pStream->Read(&m_aTextRec.aTextColor.unused, 1); + *m_pStream >> m_aTextRec.aTextColor.nR; + *m_pStream >> m_aTextRec.aTextColor.nG; + *m_pStream >> m_aTextRec.aTextColor.nB; + *m_pStream >> m_aTextRec.aTextColor.unused; - m_pStream->Read(&m_aTextRec.nTextAttrs, sizeof(m_aTextRec.nTextAttrs)); - m_pStream->Read(&m_aTextRec.nTextCharacterSet, sizeof(m_aTextRec.nTextCharacterSet)); - m_pStream->Read(&m_aTextRec.nTextRotation, sizeof(m_aTextRec.nTextRotation)); - m_pStream->Read(&m_aTextRec.nTextExtraSpacing, sizeof(m_aTextRec.nTextExtraSpacing)); + *m_pStream >> m_aTextRec.nTextAttrs; + *m_pStream >> m_aTextRec.nTextCharacterSet; + *m_pStream >> m_aTextRec.nTextRotation; + *m_pStream >> m_aTextRec.nTextExtraSpacing; - // some draw files in version 1.2 have an extra byte following '\0'. - // can't rely on that, so read in the whole string into memory. + // some draw files in version 1.2 have an extra byte following '\0'. + // can't rely on that, so read in the whole string into memory. - // the 71 is the fixed length before text content in textbox record - sal_Int16 TextLength = m_aObjHeader.nRecLen - 71; - m_aTextRec.pTextString = new sal_uInt8 [TextLength]; + // the 71 is the fixed length before text content in textbox record + sal_Int16 TextLength = m_aObjHeader.nRecLen - 71; + m_aTextRec.pTextString = new sal_uInt8 [TextLength]; - m_pStream->Read(m_aTextRec.pTextString, TextLength); + m_pStream->Read(m_aTextRec.pTextString, TextLength); } rtl::OUString LwpDrawTextBox::RegisterStyle() @@ -1190,37 +1188,37 @@ void LwpDrawTextArt::Read() { for (sal_uInt8 nC = 0; nC < 4; nC++) { - m_pStream->Read(&m_aVector[nC].x, 2); - m_pStream->Read(&m_aVector[nC].y, 2); + *m_pStream >> m_aVector[nC].x; + *m_pStream >> m_aVector[nC].y; } this->ReadClosedObjStyle(); m_aTextArtRec.aTextColor = m_aClosedObjStyleRec.aForeColor; - m_pStream->Read(&m_aTextArtRec.nIndex, 1); - m_pStream->Read(&m_aTextArtRec.nRotation, 2); + *m_pStream >> m_aTextArtRec.nIndex; + *m_pStream >> m_aTextArtRec.nRotation; sal_uInt16 nPointNumber; sal_Int16 nX, nY; - m_pStream->Read(&nPointNumber, 2); + *m_pStream >> nPointNumber; m_aTextArtRec.aPath[0].n = nPointNumber; m_aTextArtRec.aPath[0].pPts = new SdwPoint [nPointNumber*3+1]; sal_uInt16 nPt = 0; for ( nPt = 0; nPt <= nPointNumber*3; nPt++) { - m_pStream->Read(&nX, 2); - m_pStream->Read(&nY, 2); + *m_pStream >> nX; + *m_pStream >> nY; m_aTextArtRec.aPath[0].pPts[nPt].x = nX; m_aTextArtRec.aPath[0].pPts[nPt].y = nY; } - m_pStream->Read(&nPointNumber, 2); + *m_pStream >> nPointNumber; m_aTextArtRec.aPath[1].n = nPointNumber; m_aTextArtRec.aPath[1].pPts = new SdwPoint [nPointNumber*3+1]; for (nPt = 0; nPt <= nPointNumber*3; nPt++) { - m_pStream->Read(&nX, 2); - m_pStream->Read(&nY, 2); + *m_pStream >> nX; + *m_pStream >> nY; m_aTextArtRec.aPath[1].pPts[nPt].x = nX; m_aTextArtRec.aPath[1].pPts[nPt].y = nY; } @@ -1230,15 +1228,15 @@ void LwpDrawTextArt::Read() m_pStream->Read(m_aTextArtRec.tmpTextFaceName, DRAW_FACESIZE); m_pStream->SeekRel(1);// PitchAndFamily - m_pStream->Read(&m_aTextArtRec.nTextSize, sizeof(m_aTextArtRec.nTextSize)); + *m_pStream >> m_aTextArtRec.nTextSize; if (m_aTextArtRec.nTextSize < 0) m_aTextArtRec.nTextSize = -m_aTextArtRec.nTextSize; - m_pStream->Read(&m_aTextArtRec.nTextAttrs, sizeof(m_aTextArtRec.nTextAttrs)); - m_pStream->Read(&m_aTextArtRec.nTextCharacterSet, sizeof(m_aTextArtRec.nTextCharacterSet)); + *m_pStream >> m_aTextArtRec.nTextAttrs; + *m_pStream >> m_aTextArtRec.nTextCharacterSet; m_aTextArtRec.nTextRotation = 0; - m_pStream->Read(&m_aTextArtRec.nTextExtraSpacing, sizeof(m_aTextArtRec.nTextExtraSpacing)); + *m_pStream >> m_aTextArtRec.nTextExtraSpacing; const sal_uInt16 nTextArtFixedLength = 105; m_aTextArtRec.nTextLen = m_aObjHeader.nRecLen - nTextArtFixedLength @@ -1350,8 +1348,8 @@ LwpDrawBitmap::~LwpDrawBitmap() */ void LwpDrawBitmap::Read() { - m_pStream->Read(&m_aBmpRec.nTranslation, sizeof(m_aBmpRec.nTranslation)); - m_pStream->Read(&m_aBmpRec.nRotation, sizeof(m_aBmpRec.nRotation)); + *m_pStream >> m_aBmpRec.nTranslation; + *m_pStream >> m_aBmpRec.nRotation; // 20 == length of draw-specific fields. // 14 == length of bmp file header. @@ -1359,17 +1357,17 @@ void LwpDrawBitmap::Read() m_pImageData = new sal_uInt8 [m_aBmpRec.nFileSize]; BmpInfoHeader2 aInfoHeader2; - m_pStream->Read(&aInfoHeader2.nHeaderLen, 4); + *m_pStream >> aInfoHeader2.nHeaderLen; sal_uInt32 N; sal_uInt32 rgbTableSize; if (aInfoHeader2.nHeaderLen == sizeof(BmpInfoHeader)) { - m_pStream->Read(&aInfoHeader2.nWidth, 2); - m_pStream->Read(&aInfoHeader2.nHeight, 2); - m_pStream->Read(&aInfoHeader2.nPlanes, 2); - m_pStream->Read(&aInfoHeader2.nBitCount, 2); + *m_pStream >> aInfoHeader2.nWidth; + *m_pStream >> aInfoHeader2.nHeight; + *m_pStream >> aInfoHeader2.nPlanes; + *m_pStream >> aInfoHeader2.nBitCount; N = aInfoHeader2.nPlanes * aInfoHeader2.nBitCount; if (N == 24) @@ -1383,10 +1381,10 @@ void LwpDrawBitmap::Read() } else { - m_pStream->Read(&aInfoHeader2.nWidth, 4); - m_pStream->Read(&aInfoHeader2.nHeight, 4); - m_pStream->Read(&aInfoHeader2.nPlanes, 2); - m_pStream->Read(&aInfoHeader2.nBitCount, 2); + *m_pStream >> aInfoHeader2.nWidth; + *m_pStream >> aInfoHeader2.nHeight; + *m_pStream >> aInfoHeader2.nPlanes; + *m_pStream >> aInfoHeader2.nBitCount; N = aInfoHeader2.nPlanes * aInfoHeader2.nBitCount; if (N == 24) { |