[Libreoffice-commits] core.git: accessibility/source animations/source avmedia/source basctl/source basegfx/source basic/qa basic/source bridges/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 5 07:28:36 UTC 2018
accessibility/source/standard/vclxaccessiblelist.cxx | 1 -
animations/source/animcore/animcore.cxx | 6 ++----
avmedia/source/viewer/mediawindow_impl.cxx | 2 --
basctl/source/accessibility/accessibledialogwindow.cxx | 1 -
basctl/source/basicide/basobj2.cxx | 1 -
basegfx/source/polygon/b3dpolygon.cxx | 9 ---------
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 ++--
bridges/source/jni_uno/jni_info.cxx | 3 +--
13 files changed, 12 insertions(+), 31 deletions(-)
New commits:
commit c2139cafe6240991f88b85c1df12613d0ae0e821
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Sep 4 13:44:45 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Sep 5 09:28:12 2018 +0200
loplugin:simplifyconstruct in accessibility..bridges
Change-Id: I08f6a64b50f03d1b08027a2ac9e51442255d64bc
Reviewed-on: https://gerrit.libreoffice.org/59976
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index bad775c7c558..1fd7ccc5cb6e 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -56,7 +56,6 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType
const Reference< XAccessible >& _xParent)
: VCLXAccessibleComponent (pVCLWindow),
m_aBoxType (aBoxType),
- m_pListBoxHelper (nullptr),
m_nVisibleLineCount (0),
m_nIndexInParent (DEFAULT_INDEX_IN_PARENT),
m_nLastTopEntry ( 0 ),
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 826aded0fb81..5e0bff6362a8 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -1822,8 +1822,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc
if( replace == maChildren.end() )
throw NoSuchElementException();
- Reference< XInterface > xNull( nullptr );
- oldChild->setParent( xNull );
+ oldChild->setParent( Reference< XInterface >() );
(*replace) = newChild;
@@ -1846,8 +1845,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference
if( old == maChildren.end() )
throw NoSuchElementException();
- Reference< XInterface > xNull( nullptr );
- oldChild->setParent( xNull );
+ oldChild->setParent( Reference< XInterface >() );
maChildren.erase( old );
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 65bf3d6b8498..584545869cfd 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -123,8 +123,6 @@ MediaWindowImpl::MediaWindowImpl(vcl::Window* pParent, MediaWindow* pMediaWindow
, DragSourceHelper(this)
, mpMediaWindow(pMediaWindow)
, mpMediaWindowControl(bInternalMediaControl ? VclPtr<MediaWindowControl>::Create(this) : nullptr)
- , mpEmptyBmpEx(nullptr)
- , mpAudioBmpEx(nullptr)
{
if (mpMediaWindowControl)
{
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx
index c7f66797e2a8..177c79a8eed0 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -49,7 +49,6 @@ using namespace ::comphelper;
AccessibleDialogWindow::ChildDescriptor::ChildDescriptor( DlgEdObj* _pDlgEdObj )
:pDlgEdObj( _pDlgEdObj )
- ,rxAccessible( nullptr )
{
}
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 24154047ac0a..be25e26b41a0 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -206,7 +206,6 @@ namespace
MacroExecutionData()
:aDocument( ScriptDocument::NoDocument )
- ,xMethod( nullptr )
{
}
};
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 58be07cfe897..1c95fd5053f4 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -732,9 +732,6 @@ public:
// the RefCount is set to 1 to never 'delete' this static incarnation.
ImplB3DPolygon()
: maPoints(0),
- mpBColors(nullptr),
- mpNormals(nullptr),
- mpTextureCoordinates(nullptr),
maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
mbIsClosed(false),
mbPlaneNormalValid(true)
@@ -744,9 +741,6 @@ public:
ImplB3DPolygon(const ImplB3DPolygon& rToBeCopied)
: maPoints(rToBeCopied.maPoints),
- mpBColors(nullptr),
- mpNormals(nullptr),
- mpTextureCoordinates(nullptr),
maPlaneNormal(rToBeCopied.maPlaneNormal),
mbIsClosed(rToBeCopied.mbIsClosed),
mbPlaneNormalValid(rToBeCopied.mbPlaneNormalValid)
@@ -770,9 +764,6 @@ public:
ImplB3DPolygon(const ImplB3DPolygon& rToBeCopied, sal_uInt32 nIndex, sal_uInt32 nCount)
: maPoints(rToBeCopied.maPoints, nIndex, nCount),
- mpBColors(nullptr),
- mpNormals(nullptr),
- mpTextureCoordinates(nullptr),
maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
mbIsClosed(rToBeCopied.mbIsClosed),
mbPlaneNormalValid(false)
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 )
diff --git a/bridges/source/jni_uno/jni_info.cxx b/bridges/source/jni_uno/jni_info.cxx
index 045ac44ee6be..70839e168eb2 100644
--- a/bridges/source/jni_uno/jni_info.cxx
+++ b/bridges/source/jni_uno/jni_info.cxx
@@ -232,8 +232,7 @@ void JNI_compound_type_info::destroy( JNIEnv * jni_env )
JNI_compound_type_info::JNI_compound_type_info(
JNI_context const & jni, typelib_TypeDescription * td_ )
: JNI_type_info( jni, td_ ),
- m_exc_ctor( nullptr ),
- m_fields( nullptr )
+ m_exc_ctor( nullptr )
{
assert( m_td.get()->eTypeClass == typelib_TypeClass_STRUCT ||
m_td.get()->eTypeClass == typelib_TypeClass_EXCEPTION );
More information about the Libreoffice-commits
mailing list