[Libreoffice-commits] core.git: connectivity/source embeddedobj/source embedserv/source vcl/win winaccessibility/source xmlsecurity/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Sep 17 20:22:47 UTC 2018
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 1 -
connectivity/source/drivers/ado/ADriver.cxx | 2 +-
connectivity/source/drivers/ado/AResultSet.cxx | 3 ---
embeddedobj/source/msole/olemisc.cxx | 1 -
embedserv/source/embed/docholder.cxx | 2 +-
vcl/win/gdi/salfont.cxx | 1 -
winaccessibility/source/UAccCOM/EnumVariant.h | 3 +--
winaccessibility/source/service/AccObjectWinManager.cxx | 2 +-
xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 2 --
9 files changed, 4 insertions(+), 13 deletions(-)
New commits:
commit 590e44c802d7809a3a4cfb71a5fa9603aff39bd9
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 17 18:35:42 2018 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 17 22:22:24 2018 +0200
loplugin:simplifyconstruct (clang-cl)
Change-Id: I7cae6b3f31b10efc72884bce4bda7bf6b380cbc2
Reviewed-on: https://gerrit.libreoffice.org/60597
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index d787532336a1..2f8a0f96f353 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -53,7 +53,6 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet
,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
,m_aStatement(nullptr)
- ,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bWasNull(false)
,m_bEOF(false)
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index d1217a6caa18..934c3a2a47ea 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -215,7 +215,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co
}
- Reference< XTablesSupplier > xTab = nullptr;
+ Reference< XTablesSupplier > xTab;
if(pConnection)
{
WpADOCatalog aCatalog;
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 8c1b6993dabe..4a1753f8e853 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -74,7 +74,6 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) : ORes
,m_pRecordSet(_pRecordSet)
,m_pStmt(pStmt)
,m_xStatement(*pStmt)
- ,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bEOF(false)
,m_bOnFirstAfterOpen(false)
@@ -85,8 +84,6 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
,OPropertySetHelper(OResultSet_BASE::rBHelper)
,m_pRecordSet(_pRecordSet)
,m_pStmt(nullptr)
- ,m_xStatement(nullptr)
- ,m_xMetaData(nullptr)
,m_nRowPos(0)
,m_bEOF(false)
,m_bOnFirstAfterOpen(false)
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 02f2e14ac39b..83485c89d768 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -107,7 +107,6 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
// this constructor let object be initialized from clipboard
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
: m_pOleComponent( nullptr )
-, m_pInterfaceContainer( nullptr )
, m_bReadOnly( false )
, m_bDisposed( false )
, m_nObjectState( -1 )
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 0efc380843b9..03131f36896c 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -1205,7 +1205,7 @@ css::uno::Reference< css::awt::XWindow> SAL_CALL DocumentHolder::getContainerWin
if(m_xContainerWindow.is())
return m_xContainerWindow;
- uno::Reference<awt::XWindow> xWin(nullptr);
+ uno::Reference<awt::XWindow> xWin;
uno::Reference<awt::XToolkit2> xToolkit = awt::Toolkit::create( comphelper::getComponentContext(m_xFactory) );
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 6b50e55433f2..fdffffecd037 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -620,7 +620,6 @@ WinFontFace::WinFontFace( const FontAttributes& rDFS,
: PhysicalFontFace( rDFS ),
mnId( 0 ),
mbFontCapabilitiesRead( false ),
- mxUnicodeMap( nullptr ),
meWinCharSet( eWinCharSet ),
mnPitchAndFamily( nPitchAndFamily ),
mbAliasSymbolsHigh( false ),
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index a038270820cf..00e039ab018d 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -45,8 +45,7 @@ class ATL_NO_VTABLE CEnumVariant :
public:
CEnumVariant()
:m_lLBound(0),
- pUNOInterface(nullptr),
- m_pXAccessibleSelection(nullptr)
+ pUNOInterface(nullptr)
{
m_lCurrent = m_lLBound;
}
diff --git a/winaccessibility/source/service/AccObjectWinManager.cxx b/winaccessibility/source/service/AccObjectWinManager.cxx
index f1ec48216ecb..73c43cf2c111 100644
--- a/winaccessibility/source/service/AccObjectWinManager.cxx
+++ b/winaccessibility/source/service/AccObjectWinManager.cxx
@@ -399,7 +399,7 @@ int AccObjectWinManager::UpdateAccSelection(XAccessible* pXAcc)
if(pAccObj==nullptr)
return 0;
- Reference<XAccessible> pRChild = nullptr;
+ Reference<XAccessible> pRChild;
AccObject* pAccChildObj = nullptr;
int selectNum= pRSelection->getSelectedAccessibleChildCount();
diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
index efa86e02edaa..85fc50e547d5 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx
@@ -76,8 +76,6 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper<
};
XMLSecurityContext_MSCryptImpl::XMLSecurityContext_MSCryptImpl()
- ://m_pKeysMngr( NULL ) ,
- m_xSecurityEnvironment( nullptr )
{
}
More information about the Libreoffice-commits
mailing list