cppcheck:nullPointerRedundantCheck

second time lucky

Change-Id: I1ff8c750f5845180a0bcd23ac5017e8cd0331409

3 files changed, 22 insertions, 4 deletions

diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 42aaa8f33f2b..1896a12b521c 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -50,7 +50,17 @@ using namespace ::com::sun::star;
 #define LOCALE "Locale"
 
 template< typename... Ifc >
-ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& xModel, bool bCheckAmbiguoity ) throw ( script::BasicErrorException ) : ScVbaFormat_BASE( xParent, xContext ), m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ), mxPropertySet( _xPropertySet ), mxModel( xModel ), mbCheckAmbiguoity( bCheckAmbiguoity ), mbAddIndent( false )
+ScVbaFormat< Ifc... >::ScVbaFormat( const uno::Reference< XHelperInterface >& xParent,
+                                    const uno::Reference< uno::XComponentContext > & xContext,
+                                    const uno::Reference< beans::XPropertySet >& _xPropertySet,
+                                    const uno::Reference< frame::XModel >& xModel,
+                                    bool bCheckAmbiguoity ) throw ( script::BasicErrorException )
+    : ScVbaFormat_BASE( xParent, xContext ),
+      m_aDefaultLocale( OUString("en"), OUString( "US"), OUString() ),
+      mxPropertySet( _xPropertySet ),
+      mxModel( xModel ),
+      mbCheckAmbiguoity( bCheckAmbiguoity ),
+      mbAddIndent( false )
 {
     try
     {
diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx
index 15f7b905d469..6c960839d6f6 100644
--- a/sc/source/ui/vba/vbastyle.cxx
+++ b/sc/source/ui/vba/vbastyle.cxx
@@ -57,7 +57,11 @@ void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorE
 
 }
 
-ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false ), mxModel( _xModel )
+ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent,
+                        const uno::Reference< uno::XComponentContext > & xContext,
+                        const OUString& sStyleName, const uno::Reference< frame::XModel >& _xModel )
+                    throw ( script::BasicErrorException, uno::RuntimeException )
+    :  ScVbaStyle_BASE( xParent, xContext, lcl_getStyleProps( sStyleName, _xModel ), _xModel, false )
 {
     try
     {
@@ -69,7 +73,12 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< ov::XHelperInterface >& xParent, c
     }
 }
 
-ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< beans::XPropertySet >& _xPropertySet, const uno::Reference< frame::XModel >& _xModel ) throw ( script::BasicErrorException, uno::RuntimeException ) : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false ),  mxModel( _xModel )
+ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent,
+                        const uno::Reference< uno::XComponentContext > & xContext,
+                        const uno::Reference< beans::XPropertySet >& _xPropertySet,
+                        const uno::Reference< frame::XModel >& _xModel )
+                    throw ( script::BasicErrorException, uno::RuntimeException )
+    : ScVbaStyle_BASE( xParent, xContext, _xPropertySet, _xModel, false )
 {
     try
     {
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index 0e5ea95e28bb..efeed19e1ec7 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -32,7 +32,6 @@ class ScVbaStyle : public ScVbaStyle_BASE
 {
 protected:
     css::uno::Reference< css::style::XStyle > mxStyle;
-    css::uno::Reference< css::frame::XModel > mxModel;
     css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer;
     void initialise() throw ( css::uno::RuntimeException, css::script::BasicErrorException );
 public: