From c2139cafe6240991f88b85c1df12613d0ae0e821 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Tue, 4 Sep 2018 13:44:45 +0200
Subject: loplugin:simplifyconstruct in accessibility..bridges

Change-Id: I08f6a64b50f03d1b08027a2ac9e51442255d64bc
Reviewed-on: https://gerrit.libreoffice.org/59976
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 basic/qa/cppunit/basictest.cxx  | 2 +-
 basic/source/classes/sb.cxx     | 4 ++--
 basic/source/classes/sbxmod.cxx | 6 +++---
 basic/source/runtime/iosys.cxx  | 3 +--
 basic/source/sbx/sbxbase.cxx    | 1 -
 basic/source/sbx/sbxexec.cxx    | 4 ++--
 6 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'basic')

diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 9622a2867242..21e82ad0d326 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -74,7 +74,7 @@ void MacroSnippet::LoadSourceFromFile( const OUString& sMacroFileURL )
 
 SbxVariableRef MacroSnippet::Run( const css::uno::Sequence< css::uno::Any >& rArgs )
 {
-    SbxVariableRef pReturn = nullptr;
+    SbxVariableRef pReturn;
     if ( !Compile() )
         return pReturn;
     SbMethod* pMeth = mpMod.is() ? static_cast<SbMethod*>(mpMod->Find( "doUnitTest",  SbxClassType::Method )) : nullptr;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 13f366c8d6c4..434b5ffd36ae 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1952,8 +1952,8 @@ static const char pItemStr[]    = "Item";
 static const char pRemoveStr[]  = "Remove";
 static sal_uInt16 nCountHash = 0, nAddHash, nItemHash, nRemoveHash;
 
-SbxInfoRef BasicCollection::xAddInfo = nullptr;
-SbxInfoRef BasicCollection::xItemInfo = nullptr;
+SbxInfoRef BasicCollection::xAddInfo;
+SbxInfoRef BasicCollection::xItemInfo;
 
 BasicCollection::BasicCollection( const OUString& rClass )
              : SbxObject( rClass )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 51bb267c7060..559c1649337f 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -354,7 +354,7 @@ Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType )
 
 SbMethodRef DocObjectWrapper::getMethod( const OUString& aName )
 {
-    SbMethodRef pMethod = nullptr;
+    SbMethodRef pMethod;
     if ( m_pMod )
     {
         SbxFlagBits nSaveFlgs = m_pMod->GetFlags();
@@ -369,7 +369,7 @@ SbMethodRef DocObjectWrapper::getMethod( const OUString& aName )
 
 SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName )
 {
-    SbPropertyRef pProperty = nullptr;
+    SbPropertyRef pProperty;
     if ( m_pMod )
     {
         SbxFlagBits nSaveFlgs = m_pMod->GetFlags();
@@ -423,7 +423,7 @@ bool getDefaultVBAMode( StarBASIC* pb )
 
 SbModule::SbModule( const OUString& rName, bool bVBACompat )
          : SbxObject( "StarBASICModule" ),
-           pImage( nullptr ), pBreaks( nullptr ), pClassData( nullptr ), mbVBACompat( bVBACompat ),  pDocObject( nullptr ), bIsProxyModule( false )
+           mbVBACompat( bVBACompat ), bIsProxyModule( false )
 {
     SetName( rName );
     SetFlag( SbxFlagBits::ExtSearch | SbxFlagBits::GlobalSearch );
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 3413ebc355e1..e2a72044feab 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -96,8 +96,7 @@ IMPL_LINK_NOARG( SbiInputDialog, Cancel, weld::Button&, void )
 }
 
 SbiStream::SbiStream()
-    : pStrm(nullptr)
-    , nExpandOnWriteTo(0)
+    : nExpandOnWriteTo(0)
     , nLine(0)
     , nLen(0)
     , nMode(SbiStreamFlags::NONE)
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index 8259f9e2927d..8697e8bd9ef3 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -36,7 +36,6 @@
 
 SbxAppData::SbxAppData()
     : eErrCode(ERRCODE_NONE)
-    , pBasicFormater(nullptr)
     , eBasicFormaterLangType(LANGUAGE_DONTKNOW)
 {
 }
diff --git a/basic/source/sbx/sbxexec.cxx b/basic/source/sbx/sbxexec.cxx
index 7f177c27814d..efbd45052df8 100644
--- a/basic/source/sbx/sbxexec.cxx
+++ b/basic/source/sbx/sbxexec.cxx
@@ -337,7 +337,7 @@ static SbxVariableRef Element
 
 SbxVariable* SbxObject::Execute( const OUString& rTxt )
 {
-    SbxVariableRef pVar = nullptr;
+    SbxVariableRef pVar;
     const sal_Unicode* p = rTxt.getStr();
     for( ;; )
     {
@@ -366,7 +366,7 @@ SbxVariable* SbxObject::Execute( const OUString& rTxt )
 
 SbxVariable* SbxObject::FindQualified( const OUString& rName, SbxClassType t )
 {
-    SbxVariableRef pVar = nullptr;
+    SbxVariableRef pVar;
     const sal_Unicode* p = rName.getStr();
     p = SkipWhitespace( p );
     if( !*p )
-- 
cgit