diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-15 08:48:36 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-17 08:25:06 +0200 |
commit | 16690220ed6e68f2e9674a09b5008f38c5e6ed8d (patch) | |
tree | 2f830b7ac23f136585e7dc4adf5d456f4995cc99 /filter | |
parent | 86d70dc840b88ed827d6d8febaf512264009951d (diff) |
loplugin:singlevalfields
tighten up the handling of binary operators
Change-Id: I262ec57bf7142fa094d240738150a94d83fd15ee
Reviewed-on: https://gerrit.libreoffice.org/61777
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 19 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/cgm.hxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/class1.cxx | 12 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/elements.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/elements.hxx | 1 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxf2mtf.cxx | 3 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxfvec.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/idxf/dxfvec.hxx | 2 |
8 files changed, 12 insertions, 31 deletions
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index eef992866844..e1d686c5e8c3 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -32,10 +32,11 @@ using namespace ::com::sun::star; +static constexpr double gnOutdx = 28000; // Output size in 1/100TH mm +static constexpr double gnOutdy = 21000; // on which is mapped + CGM::CGM(uno::Reference< frame::XModel > const & rModel) - : mnOutdx(28000) - , mnOutdy(21000) - , mnVDCXadd(0) + : mnVDCXadd(0) , mnVDCYadd(0) , mnVDCXmul(0) , mnVDCYmul(0) @@ -396,23 +397,23 @@ void CGM::ImplSetMapMode() else mbAngReverse = false; - if (mnVDCdy == 0.0 || mnVDCdx == 0.0 || mnOutdy == 0.0) + if (mnVDCdy == 0.0 || mnVDCdx == 0.0 || gnOutdy == 0.0) { mbStatus = false; return; } double fQuo1 = mnVDCdx / mnVDCdy; - double fQuo2 = mnOutdx / mnOutdy; + double fQuo2 = gnOutdx / gnOutdy; if ( fQuo2 < fQuo1 ) { - mnXFraction = mnOutdx / mnVDCdx; - mnYFraction = mnOutdy * ( fQuo2 / fQuo1 ) / mnVDCdy; + mnXFraction = gnOutdx / mnVDCdx; + mnYFraction = gnOutdy * ( fQuo2 / fQuo1 ) / mnVDCdy; } else { - mnXFraction = mnOutdx * ( fQuo1 / fQuo2 ) / mnVDCdx; - mnYFraction = mnOutdy / mnVDCdy; + mnXFraction = gnOutdx * ( fQuo1 / fQuo2 ) / mnVDCdx; + mnYFraction = gnOutdy / mnVDCdy; } } diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index 8ecbec12998c..388b5eea3dcc 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -44,8 +44,6 @@ class CGM friend class CGMElements; friend class CGMImpressOutAct; - double mnOutdx; // Output size in 1/100TH mm - double mnOutdy; // on which is mapped double mnVDCXadd; double mnVDCYadd; double mnVDCXmul; diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx index b8eabf83f04d..a828c919695b 100644 --- a/filter/source/graphicfilter/icgm/class1.cxx +++ b/filter/source/graphicfilter/icgm/class1.cxx @@ -146,17 +146,7 @@ void CGM::ImplDoClass1() break; case 0x0a : /*Color Value Extent*/ { - if ( pElement->eColorModel == CM_RGB ) - nI1 = 6; - else - { - nI1 = 8; - mbStatus = false; // CMYK is not supported - } - for ( nI0 = 0; nI0 < nI1; nI0++ ) - { - pElement->nColorValueExtent[ nI0 ] = static_cast<sal_uInt8>(ImplGetUI( pElement->nColorPrecision )); - } + nI1 = 6; } break; case 0x0b : /*MetaFile Element List */break; diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx index 4449785988e4..8d324b68340c 100644 --- a/filter/source/graphicfilter/icgm/elements.cxx +++ b/filter/source/graphicfilter/icgm/elements.cxx @@ -62,7 +62,6 @@ CGMElements& CGMElements::operator=( const CGMElements& rSource ) eClipIndicator = rSource.eClipIndicator; aClipRect = rSource.aClipRect; eColorSelectionMode = rSource.eColorSelectionMode; - eColorModel = rSource.eColorModel; nColorMaximumIndex = rSource.nColorMaximumIndex; nLatestColorMaximumIndex = rSource.nLatestColorMaximumIndex; @@ -165,7 +164,6 @@ void CGMElements::Init() aClipRect = aVDCExtent; eColorSelectionMode = CSM_INDEXED; - eColorModel = CM_RGB; nColorMaximumIndex = 63; int i; for ( i = 0; i < 256; aColorTableEntryIs[ i++ ] = 0 ) ; diff --git a/filter/source/graphicfilter/icgm/elements.hxx b/filter/source/graphicfilter/icgm/elements.hxx index bfcba6156416..e7f0e9ca64d0 100644 --- a/filter/source/graphicfilter/icgm/elements.hxx +++ b/filter/source/graphicfilter/icgm/elements.hxx @@ -64,7 +64,6 @@ class CGMElements FloatRect aClipRect; ColorSelectionMode eColorSelectionMode; - ColorModel eColorModel; sal_uInt32 nColorMaximumIndex; // default 63 sal_uInt32 nLatestColorMaximumIndex; // default 63 sal_Int8 aColorTableEntryIs[ 256 ]; diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index 50a988274cff..e5f312b743e0 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -117,7 +117,6 @@ DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE) DXFLineInfo aDXFLineInfo; aDXFLineInfo.eStyle = LineStyle::Solid; - aDXFLineInfo.fWidth = 0; aDXFLineInfo.nDashCount = 0; aDXFLineInfo.fDashLen = 0; aDXFLineInfo.nDotCount = 0; @@ -789,7 +788,6 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF nBlockColor=7; aBlockDXFLineInfo.eStyle = LineStyle::Solid; - aBlockDXFLineInfo.fWidth = 0; aBlockDXFLineInfo.nDashCount = 0; aBlockDXFLineInfo.fDashLen = 0; aBlockDXFLineInfo.nDotCount = 0; @@ -804,7 +802,6 @@ bool DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF else { nParentLayerColor=7; aParentLayerDXFLineInfo.eStyle = LineStyle::Solid; - aParentLayerDXFLineInfo.fWidth = 0; aParentLayerDXFLineInfo.nDashCount = 0; aParentLayerDXFLineInfo.fDashLen = 0; aParentLayerDXFLineInfo.nDotCount = 0; diff --git a/filter/source/graphicfilter/idxf/dxfvec.cxx b/filter/source/graphicfilter/idxf/dxfvec.cxx index b49edff2c8fe..e0189c3eca51 100644 --- a/filter/source/graphicfilter/idxf/dxfvec.cxx +++ b/filter/source/graphicfilter/idxf/dxfvec.cxx @@ -205,7 +205,7 @@ LineInfo DXFTransform::Transform(const DXFLineInfo& aDXFLineInfo) const LineInfo aLineInfo; aLineInfo.SetStyle( aDXFLineInfo.eStyle ); - aLineInfo.SetWidth( static_cast<sal_Int32>(aDXFLineInfo.fWidth * scale + 0.5) ); + aLineInfo.SetWidth( 0 ); aLineInfo.SetDashCount( static_cast< sal_uInt16 >( aDXFLineInfo.nDashCount ) ); aLineInfo.SetDashLen( static_cast<sal_Int32>(aDXFLineInfo.fDashLen * scale + 0.5) ); aLineInfo.SetDotCount( static_cast< sal_uInt16 >( aDXFLineInfo.nDotCount ) ); diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx index 6dd5f3de5eaf..3260999fe981 100644 --- a/filter/source/graphicfilter/idxf/dxfvec.hxx +++ b/filter/source/graphicfilter/idxf/dxfvec.hxx @@ -28,7 +28,6 @@ class Point; class DXFLineInfo { public: LineStyle eStyle; - double fWidth; sal_Int32 nDashCount; double fDashLen; sal_Int32 nDotCount; @@ -37,7 +36,6 @@ public: DXFLineInfo() : eStyle(LineStyle::Solid), - fWidth(0), nDashCount(0), fDashLen(0), nDotCount(0), |