[Libreoffice-commits] core.git: compilerplugins/clang editeng/source include/editeng

[Noel Grandin]

 compilerplugins/clang/datamembershadow.cxx |    5 +----
 editeng/source/uno/unotext.cxx             |    2 +-
 include/editeng/unotext.hxx                |    2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit fbe2d12f19dac29107e89ce4b3153fa6922633e5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Wed Jan 24 16:39:11 2018 +0200

    loplugin:datamembershadow in SvxUnoTextRangeBase
    
    make the superclass member private
    
    Change-Id: I665d87bfdfc3d7804cd4cac6108f9bc65b9ca2b5
    Reviewed-on: https://gerrit.libreoffice.org/48552
    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 520e1195f0ca..54e671daffa1 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -19,6 +19,7 @@
  * Check for data member being shadowed.
  *
  * @TODO check for any members in superclass hierarchy with duplicate names,
+ *       regardless of their visibility,
  *       more specific names will make the code easier to read
  */
 namespace
@@ -84,12 +85,8 @@ bool DataMemberShadow::VisitFieldDecl(FieldDecl const * fieldDecl)
     if (loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stortree.hxx")
         || loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stordata.hxx"))
         return true;
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/svx/source/inc/cell.hxx"))
-        return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/sw/source/uibase/inc/dbtree.hxx"))
         return true;
-    if (loplugin::isSamePathname(aFileName, SRCDIR "/vcl/unx/generic/print/genpspgraphics.cxx"))
-        return true;
 
     const CXXRecordDecl* parentCXXRecordDecl = dyn_cast<CXXRecordDecl>(fieldDecl->getDeclContext());
     if (!parentCXXRecordDecl) {
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 7859b4f1185e..6b6127c92ec8 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -208,7 +208,7 @@ void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw()
 UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase );
 
 SvxUnoTextRangeBase::SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet)
-    : mpEditSource(nullptr) , mpPropSet(_pSet)
+    : mpPropSet(_pSet), mpEditSource(nullptr)
 {
 }
 
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 4ee3bf4fc11d..4b4eb127aae0 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -250,11 +250,11 @@ class EDITENG_DLLPUBLIC SvxUnoTextRangeBase : public css::text::XTextRange,
 {
     friend class SvxUnoTextRangeEnumeration;
     friend class ::accessibility::AccessibleEditableTextPara;
+    const SvxItemPropertySet* mpPropSet;
 
 protected:
     SvxEditSource*          mpEditSource;
     ESelection              maSelection;
-    const SvxItemPropertySet* mpPropSet;
 
     /// @throws css::beans::UnknownPropertyException
     /// @throws css::beans::PropertyVetoException