[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source

[Noel Grandin]

 include/xmloff/xmlimp.hxx           |    4 ++--
 xmloff/inc/txtvfldi.hxx             |    3 ---
 xmloff/source/draw/ximp3dobject.cxx |   12 ++++++------
 xmloff/source/draw/ximp3dobject.hxx |    2 +-
 xmloff/source/text/txtvfldi.cxx     |    3 +--
 5 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit f4e24dd79cfe1133b5a34c7fc9036036812f77bf
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Nov 17 10:23:00 2016 +0200

    loplugin:datamembershadow in xmloff
    
    Change-Id: Ibea23b1757be1ec007f48261130aad74ce750cfc
    Reviewed-on: https://gerrit.libreoffice.org/30925
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 84e1713..f4ed9fd 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -206,9 +206,9 @@ class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8<
         const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList);
     void Characters(const OUString& aChars);
 
-protected:
-
     css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator;
+
+protected:
     bool                        mbIsFormsSupported;
     bool                        mbIsTableShapeSupported;
     bool                        mbIsGraphicLoadOnDemandSupported;
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index 26f14cd..ba7f633 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 02205c6..b573afd 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 d60a253..819b4a3 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 eb1d157..a39315b 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
 }