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

[Noel Grandin]

 sc/source/ui/vba/vbaformat.cxx    |   12 +++++++++++-
 sc/source/ui/vba/vbastyle.cxx     |   13 +++++++++++--
 sc/source/ui/vba/vbastyle.hxx     |    1 -
 sw/source/filter/ww8/wrtw8nds.cxx |    3 +--
 sw/source/filter/ww8/wrtww8.cxx   |    1 -
 sw/source/filter/ww8/wrtww8.hxx   |    1 -
 6 files changed, 23 insertions(+), 8 deletions(-)

New commits:
commit 6be5ed60e1823d909511c6af48e6bdc2817cce7c
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Oct 19 10:03:31 2015 +0200

    cppcheck:nullPointerRedundantCheck
    
    second time lucky
    
    Change-Id: I1ff8c750f5845180a0bcd23ac5017e8cd0331409

diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 42aaa8f..1896a12 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 15f7b90..6c96083 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 0e5ea95..efeed19 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:
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index f3da842..66dfe4f 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3068,8 +3068,7 @@ void MSWordExportBase::OutputContentNode( const SwContentNode& rNode )
         case ND_TEXTNODE:
         {
             const SwTextNode& rTextNode = *rNode.GetTextNode();
-            if( !m_bOutOutlineOnly || rTextNode.IsOutline() )
-                OutputTextNode( rTextNode );
+            OutputTextNode( rTextNode );
         }
         break;
         case ND_GRFNODE:
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 8bd3e1d..588dc5f 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3395,7 +3395,6 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
     , m_bTabInTOC(false)
     , m_bHideTabLeaderAndPageNumbers(false)
     , m_bExportModeRTF(false)
-    , m_bOutOutlineOnly(false)
     , m_bFontSizeWritten(false)
     , m_pDoc(pDocument)
     , m_nCurStart(pCurrentPam->GetPoint()->nNode.GetIndex())
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3638e69..ea1e06f 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -555,7 +555,6 @@ public:
 
     bool m_bHideTabLeaderAndPageNumbers : 1 ; // true: the 'z' field of TOC is set.
     bool m_bExportModeRTF;
-    bool m_bOutOutlineOnly;   // export outline nodes, only (send outline to clipboard/presentation)
     /// Is font size written already as part of the current character properties?
     bool m_bFontSizeWritten;