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

[Noel Grandin]

 compilerplugins/clang/datamembershadow.cxx |    2 --
 sc/source/ui/vba/vbastyles.cxx             |    8 +++++++-
 sc/source/ui/vba/vbastyles.hxx             |    3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 3ef9353041a5d132c4797578fec05fd73812e10a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu May 10 13:43:32 2018 +0200

    loplugin:datamembershadow in ScVbaStyles
    
    member already present in superclass InheritedHelperInterfaceImpl
    
    Change-Id: I52a8178f95ad65dc0780ba0f82d6322cea039ba4
    Reviewed-on: https://gerrit.libreoffice.org/54109
    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 5784b2c6c8b6..6e71ce57a4e7 100644
--- a/compilerplugins/clang/datamembershadow.cxx
+++ b/compilerplugins/clang/datamembershadow.cxx
@@ -55,8 +55,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 "/sc/source/ui/vba/vbastyles.hxx"))
-        return true;
     if (loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stortree.hxx")
         || loplugin::isSamePathname(aFileName, SRCDIR "/store/source/stordata.hxx"))
         return true;
diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx
index 2b8da076c2ba..a4bb3452f884 100644
--- a/sc/source/ui/vba/vbastyles.cxx
+++ b/sc/source/ui/vba/vbastyles.cxx
@@ -33,7 +33,13 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc
     return uno::makeAny( xStyle );
 }
 
-ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent )
+ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent,
+                          const uno::Reference< css::uno::XComponentContext > & xContext,
+                          const uno::Reference< frame::XModel >& xModel )
+: ScVbaStyles_BASE( xParent,
+                    xContext,
+                    uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ),
+  mxModel( xModel )
 {
     try
     {
diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx
index 82f60d3a8cda..39ac51ea3de9 100644
--- a/sc/source/ui/vba/vbastyles.hxx
+++ b/sc/source/ui/vba/vbastyles.hxx
@@ -27,9 +27,6 @@ typedef CollTestImplHelper< ov::excel::XStyles > ScVbaStyles_BASE;
 class ScVbaStyles: public ScVbaStyles_BASE
 {
     css::uno::Reference< css::frame::XModel > mxModel;
-    // hard ref to parent ( perhaps we should try this in the
-    // XHelperInterface itself
-    css::uno::Reference< ov::XHelperInterface > mxParent;
     css::uno::Reference< css::lang::XMultiServiceFactory > mxMSF;
     css::uno::Reference< css::container::XNameContainer > mxNameContainerCellStyles;
 public: