[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang cui/source filter/source

[Noel Grandin]

 compilerplugins/clang/datamembershadow.cxx    |    4 ----
 cui/source/inc/macropg.hxx                    |    2 +-
 filter/source/graphicfilter/idxf/dxfentrd.cxx |    4 ----
 filter/source/graphicfilter/idxf/dxfentrd.hxx |    2 --
 4 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 026077340dc5659ab4428691d4cd265d118eb726
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 10 11:46:20 2018 +0200

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

diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx
index 0262eca2d8bd..f92d748eaa25 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -53,8 +53,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/cppcanvas/source/mtfrenderer/emfplus.cxx"))
         return true;
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/cui/source/customize/eventdlg.hxx"))
-        return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/recentdocsview.hxx"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/templatelocalview.hxx"))
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index cd6ecb5533e1..2020c3e4f0bf 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -63,9 +63,9 @@ class SvxMacroTabPage_ : public SfxTabPage
 
     static long GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* pBtn );
 
+    css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
 protected:
     SvxMacroTabPage_Impl*      mpImpl;
-    css::uno::Reference< css::container::XNameReplace > m_xAppEvents;
     css::uno::Reference< css::container::XNameReplace > m_xDocEvents;
     css::uno::Reference< css::util::XModifiable > m_xModifiable;
     EventsHash m_appEventsHash;
commit 19156dccf7040094ce682081545213abb321c559
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 10 11:41:57 2018 +0200

    loplugin:datamembershadow in DXF filter
    
    depending on which version of the DXF file format you look at, elevation
    can be either group code 30 or group code 38. But since neither of these
    fields is actually in use, lets just remove both until someone has an
    actual use-case for them and can test against real data.
    
    Change-Id: I4355b37c4b8513e8f9704272b269b2fe3f1c659f
    Reviewed-on: https://gerrit.libreoffice.org/54104
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx
index c4e9370b36f1..0262eca2d8bd 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -59,8 +59,6 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/include/sfx2/templatelocalview.hxx"))
         return true;
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/filter/source/graphicfilter/idxf/dxfentrd.hxx"))
-        return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/sc/source/ui/vba/vbastyles.hxx"))
         return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/sd/inc/Outliner.hxx"))
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index 7a9074a0a770..bcb698994831 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -29,7 +29,6 @@ DXFBasicEntity::DXFBasicEntity(DXFEntityType eThisType)
 {
     eType=eThisType;
     pSucc=nullptr;
-    fElevation=0;
     fThickness=0;
     nColor=256;
     nSpace=0;
@@ -49,7 +48,6 @@ void DXFBasicEntity::EvaluateGroup(DXFGroupReader & rDGR)
     {
         case   8: m_sLayer = rDGR.GetS(); break;
         case   6: m_sLineType = rDGR.GetS(); break;
-        case  38: fElevation=rDGR.GetF(); break;
         case  39: fThickness=rDGR.GetF(); break;
         case  62: nColor=rDGR.GetI(); break;
         case  67: nSpace=rDGR.GetI(); break;
@@ -374,7 +372,6 @@ void DXFAttribEntity::EvaluateGroup(DXFGroupReader & rDGR)
 
 DXFPolyLineEntity::DXFPolyLineEntity() : DXFBasicEntity(DXF_POLYLINE)
 {
-    fElevation=0.0;
     nFlags=0;
     fSWidth=0.0;
     fEWidth=0.0;
@@ -388,7 +385,6 @@ DXFPolyLineEntity::DXFPolyLineEntity() : DXFBasicEntity(DXF_POLYLINE)
 void DXFPolyLineEntity::EvaluateGroup(DXFGroupReader & rDGR)
 {
     switch (rDGR.GetG()) {
-        case 30: fElevation=rDGR.GetF(); break;
         case 70: nFlags=rDGR.GetI(); break;
         case 40: fSWidth=rDGR.GetF(); break;
         case 41: fEWidth=rDGR.GetF(); break;
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx
index 39d9b12fbff6..f2aa8d3c90aa 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx
@@ -64,7 +64,6 @@ public:
     // commented with group codes:
     OString m_sLayer;                     //  8
     OString m_sLineType;                  //  6
-    double fElevation;                    // 38
     double fThickness;                    // 39
     long nColor;                          // 62
     long nSpace;                          // 67
@@ -304,7 +303,6 @@ class DXFPolyLineEntity : public DXFBasicEntity {
 
 public:
 
-    double fElevation; // 30
     long nFlags;       // 70
     double fSWidth;    // 40
     double fEWidth;    // 41