diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-04-12 11:34:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-04-12 14:57:12 +0200 |
| commit | 71a11d27e2ef8ccf3e7a0f570d53ddb6a86d5a27 (patch) | |
| tree | afb5d2e9b9c42d76a475688a0a48c1c5f57fe19f | |
| parent | 0c7f683766c58062e3ea1e613ffd4d237ffcb856 (diff) | |
drop unused width variable
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>
| -rw-r--r-- | vcl/source/filter/imet/ios2met.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/filter/imet/ios2met.cxx b/vcl/source/filter/imet/ios2met.cxx index 2beac50bde2c..d7fa46a9a6f8 100644 --- a/vcl/source/filter/imet/ios2met.cxx +++ b/vcl/source/filter/imet/ios2met.cxx @@ -313,7 +313,7 @@ struct OSAttr RasterOp eImgBgMix; sal_Int32 nArcP, nArcQ, nArcR, nArcS; Degree10 nChrAng; - Size aChrCellSize; + sal_Int32 nChrCellHeight; sal_uInt32 nChrSet; Point aCurPos; PenStyle eLinStyle; @@ -1035,7 +1035,7 @@ void OS2METReader::ReadChrStr(bool bGivenPos, bool bMove, bool bExtra, sal_uInt1 if (pF!=nullptr) aFont = pF->aFont; aFont.SetColor(aAttr.aChrCol); - aFont.SetFontSize(Size(0,aAttr.aChrCellSize.Height())); + aFont.SetFontSize(Size(0,aAttr.nChrCellHeight)); if ( aAttr.nChrAng ) aFont.SetOrientation(aAttr.nChrAng); @@ -2087,12 +2087,12 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) [[fallthrough]]; case GOrdSChCel: { sal_uInt16 nLen=nOrderLen; - auto nWidth = ReadCoord(bCoord32); + (void) ReadCoord(bCoord32); // Width, unused auto nHeight = ReadCoord(bCoord32); - if (nWidth < 0 || nHeight < 0) - aAttr.aChrCellSize = aDefAttr.aChrCellSize; + if (nHeight < 0) + aAttr.nChrCellHeight = aDefAttr.nChrCellHeight; else - aAttr.aChrCellSize = Size(nWidth, nHeight); + aAttr.nChrCellHeight = nHeight; if (bCoord32) nLen-=8; else nLen-=4; if (nLen>=4) { pOS2MET->SeekRel(4); nLen-=4; @@ -2100,8 +2100,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) if (nLen>=2) { sal_uInt8 nbyte(0); pOS2MET->ReadUChar( nbyte ); - if ((nbyte&0x80)==0 && aAttr.aChrCellSize==Size(0,0)) - aAttr.aChrCellSize = aDefAttr.aChrCellSize; + if ((nbyte&0x80)==0 && aAttr.nChrCellHeight == 0) + aAttr.nChrCellHeight = aDefAttr.nChrCellHeight; } break; } @@ -2757,7 +2757,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF aDefAttr.nArcR =0; aDefAttr.nArcS =0; aDefAttr.nChrAng =0_deg10; - aDefAttr.aChrCellSize=Size(12,12); + aDefAttr.nChrCellHeight = 12; aDefAttr.nChrSet =0; aDefAttr.aCurPos =Point(0,0); aDefAttr.eLinStyle =PEN_SOLID; |