diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-17 10:23:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-17 08:59:58 +0000 |
| commit | f4e24dd79cfe1133b5a34c7fc9036036812f77bf (patch) | |
| tree | b051cda51c0e470d4a41f1873cdf9811cb28dd14 /xmloff | |
| parent | c1e0dffbe2db3b4459c4d57dbf337b75c7c392d4 (diff) | |
loplugin:datamembershadow in xmloff
Change-Id: Ibea23b1757be1ec007f48261130aad74ce750cfc
Reviewed-on: https://gerrit.libreoffice.org/30925
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/txtvfldi.hxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/ximp3dobject.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/draw/ximp3dobject.hxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 26f14cd019f9..ba7f6335f59c 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -234,11 +234,8 @@ protected: /*** import text input fields (<text:text-input>) */ class XMLTextInputFieldImportContext : public XMLVarFieldImportContext { - const OUString sPropertyContent; - public: - XMLTextInputFieldImportContext( SvXMLImport& rImport, /// XML Import XMLTextImportHelper& rHlp, /// Text import helper diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 02205c602ce5..b573afd2fc9f 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -193,7 +193,7 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( uno::Reference< drawing::XShapes >& rShapes) : SdXML3DObjectContext( rImport, nPrfx, rLocalName, xAttrList, rShapes ), maCenter(0.0, 0.0, 0.0), - maSize(5000.0, 5000.0, 5000.0), + maSphereSize(5000.0, 5000.0, 5000.0), mbCenterUsed(false), mbSizeUsed(false) { @@ -225,9 +225,9 @@ SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( ::basegfx::B3DVector aNewVec; SvXMLUnitConverter::convertB3DVector(aNewVec, sValue); - if(aNewVec != maSize) + if(aNewVec != maSphereSize) { - maSize = aNewVec; + maSphereSize = aNewVec; mbSizeUsed = true; } break; @@ -262,9 +262,9 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa aPosition3D.PositionY = maCenter.getY(); aPosition3D.PositionZ = maCenter.getZ(); - aDirection3D.DirectionX = maSize.getX(); - aDirection3D.DirectionY = maSize.getY(); - aDirection3D.DirectionZ = maSize.getZ(); + aDirection3D.DirectionX = maSphereSize.getX(); + aDirection3D.DirectionY = maSphereSize.getY(); + aDirection3D.DirectionZ = maSphereSize.getZ(); xPropSet->setPropertyValue("D3DPosition", uno::Any(aPosition3D)); xPropSet->setPropertyValue("D3DSize", uno::Any(aDirection3D)); diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index d60a253d533f..819b4a3e26ee 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -76,7 +76,7 @@ public: class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext { ::basegfx::B3DVector maCenter; - ::basegfx::B3DVector maSize; + ::basegfx::B3DVector maSphereSize; bool mbCenterUsed; bool mbSizeUsed; diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index eb1d1573658c..a39315b52c8f 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -586,8 +586,7 @@ XMLTextInputFieldImportContext::XMLTextInputFieldImportContext( true, true, true, false, false, false, false, false, - false), - sPropertyContent(sAPI_content) + false) { bValid = true; // always valid } |