mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop unused width variable

Browse Source 
Change-Id: I836234f86c01300d1a55e901699fee840efb37dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132895
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2022-04-12 11:34:53 +01:00
parent 0c7f683766
commit 71a11d27e2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vcl/source/filter/imet/ios2met.cxx
View File

@@ -313,7 +313,7 @@ struct OSAttr
RasterOp eImgBgMix; RasterOp eImgBgMix;
sal_Int32 nArcP, nArcQ, nArcR, nArcS; sal_Int32 nArcP, nArcQ, nArcR, nArcS;
Degree10 nChrAng; Degree10 nChrAng;
Size aChrCellSize; sal_Int32 nChrCellHeight;
sal_uInt32 nChrSet; sal_uInt32 nChrSet;
Point aCurPos; Point aCurPos;
PenStyle eLinStyle; PenStyle eLinStyle;
@@ -1035,7 +1035,7 @@ void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt1
if (pF!=nullptr) if (pF!=nullptr)
aFont = pF->aFont; aFont = pF->aFont;
aFont.SetColor(aAttr.aChrCol); aFont.SetColor(aAttr.aChrCol);
aFont.SetFontSize(Size(0,aAttr.aChrCellSize.Height())); aFont.SetFontSize(Size(0,aAttr.nChrCellHeight));
if ( aAttr.nChrAng ) if ( aAttr.nChrAng )
aFont.SetOrientation(aAttr.nChrAng); aFont.SetOrientation(aAttr.nChrAng);
@@ -2087,12 +2087,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
[[fallthrough]]; [[fallthrough]];
case GOrdSChCel: { case GOrdSChCel: {
sal_uInt16 nLen=nOrderLen; sal_uInt16 nLen=nOrderLen;
auto nWidth = ReadCoord(bCoord32); (void) ReadCoord(bCoord32); // Width, unused
auto nHeight = ReadCoord(bCoord32); auto nHeight = ReadCoord(bCoord32);
if (nWidth < 0 || nHeight < 0) if (nHeight < 0)
aAttr.aChrCellSize = aDefAttr.aChrCellSize; aAttr.nChrCellHeight = aDefAttr.nChrCellHeight;
else else
aAttr.aChrCellSize = Size(nWidth, nHeight); aAttr.nChrCellHeight = nHeight;
if (bCoord32) nLen-=8; else nLen-=4; if (bCoord32) nLen-=8; else nLen-=4;
if (nLen>=4) { if (nLen>=4) {
pOS2MET->SeekRel(4); nLen-=4; pOS2MET->SeekRel(4); nLen-=4;
@@ -2100,8 +2100,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen)
if (nLen>=2) { if (nLen>=2) {
sal_uInt8 nbyte(0); sal_uInt8 nbyte(0);
pOS2MET->ReadUChar( nbyte ); pOS2MET->ReadUChar( nbyte );
if ((nbyte&0x80)==0 && aAttr.aChrCellSize==Size(0,0)) if ((nbyte&0x80)==0 && aAttr.nChrCellHeight == 0)
aAttr.aChrCellSize = aDefAttr.aChrCellSize; aAttr.nChrCellHeight = aDefAttr.nChrCellHeight;
} }
break; break;
} }
@@ -2757,7 +2757,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
aDefAttr.nArcR =0; aDefAttr.nArcR =0;
aDefAttr.nArcS =0; aDefAttr.nArcS =0;
aDefAttr.nChrAng =0_deg10; aDefAttr.nChrAng =0_deg10;
aDefAttr.aChrCellSize=Size(12,12); aDefAttr.nChrCellHeight = 12;
aDefAttr.nChrSet =0; aDefAttr.nChrSet =0;
aDefAttr.aCurPos =Point(0,0); aDefAttr.aCurPos =Point(0,0);
aDefAttr.eLinStyle =PEN_SOLID; aDefAttr.eLinStyle =PEN_SOLID;