[Libreoffice-commits] core.git: 2 commits - editeng/source embeddedobj/source eventattacher/source extensions/source sal/qa
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Sep 8 12:45:33 UTC 2018
editeng/source/accessibility/AccessibleContextBase.cxx | 2 -
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 1
editeng/source/editeng/editdoc.cxx | 1
editeng/source/editeng/editundo.cxx | 2 -
editeng/source/editeng/eehtml.cxx | 1
editeng/source/editeng/impedit5.cxx | 1
editeng/source/items/frmitems.cxx | 7 ------
editeng/source/items/numitem.cxx | 10 ++------
editeng/source/misc/svxacorr.cxx | 3 --
editeng/source/misc/txtrange.cxx | 1
editeng/source/misc/unolingu.cxx | 16 +++++++-------
editeng/source/rtf/svxrtf.cxx | 4 ---
editeng/source/uno/unoforou.cxx | 2 -
editeng/source/uno/unotext.cxx | 2 -
editeng/source/xml/xmltxtexp.cxx | 3 --
embeddedobj/source/general/intercept.cxx | 3 --
embeddedobj/source/msole/olemisc.cxx | 2 -
eventattacher/source/eventattacher.cxx | 2 -
extensions/source/abpilot/datasourcehandling.cxx | 1
extensions/source/logging/loghandler.cxx | 1
extensions/source/propctrlr/controlfontdialog.cxx | 1
extensions/source/scanner/grid.cxx | 1
extensions/source/scanner/sane.cxx | 1
extensions/source/scanner/sanedlg.cxx | 1
sal/qa/rtl/alloc/rtl_alloc.cxx | 4 +--
25 files changed, 19 insertions(+), 54 deletions(-)
New commits:
commit 85966810131b1db3fe0cdc0c54b08703350abf39
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Sep 7 16:20:44 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 8 14:45:22 2018 +0200
clang-tidy bugprone-sizeof-expression
this was not really testing anything before, because it was doing
sizeof(char*)
which is 4 or 8
Change-Id: I7eccdd3c6ae14a6fabb27202737fdb2fd12663dc
Reviewed-on: https://gerrit.libreoffice.org/60182
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 0e9b7c0f47a8..f59d78f9fa6c 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -155,7 +155,7 @@ public:
void test()
{
- const char *sample = "Hello World";
+ const char sample[] = "Hello World";
std::vector<OUString> aStrings;
rtl_alloc_preInit(true);
@@ -168,7 +168,7 @@ public:
for (int i = 1; i < 4096; i += 8)
{
OUStringBuffer aBuf(i);
- aBuf.appendAscii(sample, (i/8) % (sizeof(sample)-1));
+ aBuf.appendAscii(sample, (i/8) % (SAL_N_ELEMENTS(sample)-1));
OUString aStr = aBuf.makeStringAndClear();
aStrings.push_back(aStr);
}
commit 2002bbe83de99784e38edc206f83c580e2a7a7a7
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Sep 7 20:58:25 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Sep 8 14:45:11 2018 +0200
loplugin:simplifyconstruct in editeng..extensions
Change-Id: I646a24382554312d92a4a8746d5267767353a53f
Reviewed-on: https://gerrit.libreoffice.org/60169
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index b8bf944a64ec..b34b26f35ee7 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -44,8 +44,6 @@ AccessibleContextBase::AccessibleContextBase (
const uno::Reference<XAccessible>& rxParent,
const sal_Int16 aRole)
: WeakComponentImplHelper(MutexOwner::maMutex),
- mxStateSet (nullptr),
- mxRelationSet (nullptr),
mxParent(rxParent),
msDescription(),
meDescriptionOrigin(NotSet),
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 6dac619d4e49..e080ae4468af 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -183,7 +183,6 @@ namespace accessibility
AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() :
- mxThis( nullptr ),
mxTextParagraph( new AccessibleEditableTextPara(nullptr) ),
maEditSource(),
maMutex(),
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 2e3fcec41184..37cf24dee476 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -487,7 +487,6 @@ ExtraPortionInfo::ExtraPortionInfo()
, nAsianCompressionTypes(AsianCompressionFlags::Normal)
, bFirstCharIsRightPunktuation(false)
, bCompressed(false)
-, pOrgDXArray(nullptr)
, lineBreaksList()
{
}
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 89007b3a20e2..19c150d371b8 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -592,7 +592,7 @@ void EditUndoSetAttribs::ImpSetSelection()
EditUndoTransliteration::EditUndoTransliteration(EditEngine* pEE, const ESelection& rESel, TransliterationFlags nM) :
EditUndo(EDITUNDO_TRANSLITERATE, pEE),
- aOldESel(rESel), nMode(nM), pTxtObj(nullptr) {}
+ aOldESel(rESel), nMode(nM) {}
EditUndoTransliteration::~EditUndoTransliteration()
{
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 79de3dc22ae0..fb1e9af29528 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -41,7 +41,6 @@ EditHTMLParser::EditHTMLParser( SvStream& rIn, const OUString& rBaseURL, SvKeyVa
: HTMLParser( rIn, true ),
aBaseURL( rBaseURL ),
mpEditEngine(nullptr),
- pCurAnchor(nullptr),
bInPara(false),
bWasInPara(false),
bFieldsInserted(false),
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index 109450adbd9e..1cd61deca16f 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -824,7 +824,6 @@ void IdleFormattter::ForceTimeout()
ImplIMEInfos::ImplIMEInfos( const EditPaM& rPos, const OUString& rOldTextAfterStartPos )
: aOldTextAfterStartPos( rOldTextAfterStartPos ),
- pAttribs(nullptr),
aPos(rPos),
nLen(0),
bWasCursorOverwrite(false)
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 2c40069d5d47..1904c0d1a7a1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2241,8 +2241,6 @@ bool SvxBoxItem::HasBorder( bool bTreatPaddingAsBorder ) const
SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
- pHori ( nullptr ),
- pVert ( nullptr ),
mbEnableHor( false ),
mbEnableVer( false ),
nDefDist( 0 )
@@ -2877,10 +2875,7 @@ bool SvxFormatKeepItem::GetPresentation
SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
-
- SfxPoolItem ( nId ),
-
- pLine( nullptr )
+ SfxPoolItem ( nId )
{
}
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 0e8c012a5df9..61cb873fe1f7 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::style;
sal_Int32 SvxNumberType::nRefCount = 0;
-css::uno::Reference<css::text::XNumberingFormatter> SvxNumberType::xFormatter = nullptr;
+css::uno::Reference<css::text::XNumberingFormatter> SvxNumberType::xFormatter;
static void lcl_getFormatter(css::uno::Reference<css::text::XNumberingFormatter>& _xFormatter)
{
if(!_xFormatter.is())
@@ -165,17 +165,13 @@ SvxNumberFormat::SvxNumberFormat( SvxNumType eType )
mnListtabPos( 0 ),
mnFirstLineIndent( 0 ),
mnIndentAt( 0 ),
- pGraphicBrush(nullptr),
- eVertOrient(text::VertOrientation::NONE),
- pBulletFont(nullptr)
+ eVertOrient(text::VertOrientation::NONE)
{
}
SvxNumberFormat::SvxNumberFormat(const SvxNumberFormat& rFormat) :
SvxNumberType(rFormat),
- mePositionAndSpaceMode( rFormat.mePositionAndSpaceMode ),
- pGraphicBrush(nullptr),
- pBulletFont(nullptr)
+ mePositionAndSpaceMode( rFormat.mePositionAndSpaceMode )
{
*this = rFormat;
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3029101da61d..32bd3dc37833 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1915,9 +1915,6 @@ SvxAutoCorrectLanguageLists::SvxAutoCorrectLanguageLists(
aModifiedDate( Date::EMPTY ),
aModifiedTime( tools::Time::EMPTY ),
aLastCheckTime( tools::Time::EMPTY ),
- pCplStt_ExcptLst( nullptr ),
- pWrdStt_ExcptLst( nullptr ),
- pAutocorr_List( nullptr ),
rAutoCorrect(rParent),
nFlags(ACFlags::NONE)
{
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 299e568fe404..529fe44e46dd 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -32,7 +32,6 @@ TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DPolyPolygon* pLinePolyPolygon,
sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght,
bool bSimpl, bool bInnr, bool bVert ) :
- pBound( nullptr ),
nCacheSize( nCacheSz ),
nRight( nRght ),
nLeft( nLft ),
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 4d21c60a0ab2..a53d8337f033 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -452,14 +452,14 @@ void LinguMgrExitLstnr::AtExit()
LinguMgrExitLstnr * LinguMgr::pExitLstnr = nullptr;
bool LinguMgr::bExiting = false;
-uno::Reference< XLinguServiceManager2 > LinguMgr::xLngSvcMgr = nullptr;
-uno::Reference< XSpellChecker1 > LinguMgr::xSpell = nullptr;
-uno::Reference< XHyphenator > LinguMgr::xHyph = nullptr;
-uno::Reference< XThesaurus > LinguMgr::xThes = nullptr;
-uno::Reference< XSearchableDictionaryList > LinguMgr::xDicList = nullptr;
-uno::Reference< XLinguProperties > LinguMgr::xProp = nullptr;
-uno::Reference< XDictionary > LinguMgr::xIgnoreAll = nullptr;
-uno::Reference< XDictionary > LinguMgr::xChangeAll = nullptr;
+uno::Reference< XLinguServiceManager2 > LinguMgr::xLngSvcMgr;
+uno::Reference< XSpellChecker1 > LinguMgr::xSpell;
+uno::Reference< XHyphenator > LinguMgr::xHyph;
+uno::Reference< XThesaurus > LinguMgr::xThes;
+uno::Reference< XSearchableDictionaryList > LinguMgr::xDicList;
+uno::Reference< XLinguProperties > LinguMgr::xProp;
+uno::Reference< XDictionary > LinguMgr::xIgnoreAll;
+uno::Reference< XDictionary > LinguMgr::xChangeAll;
uno::Reference< XLinguServiceManager2 > LinguMgr::GetLngSvcMgr()
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 88a3a1c110bf..5864354802cd 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -61,9 +61,7 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn )
: SvRTFParser( rIn, 5 )
, aPlainMap(rPool)
, aPardMap(rPool)
- , pInsPos( nullptr )
, pAttrPool( &rPool )
- , pRTFDefaults( nullptr )
, nDfltFont( 0)
, bNewDoc( true )
, bNewGroup( false)
@@ -945,7 +943,6 @@ SvxRTFItemStackType::SvxRTFItemStackType(
SfxItemPool& rPool, const sal_uInt16* pWhichRange,
const EditPosition& rPos )
: aAttrSet( rPool, pWhichRange )
- , m_pChildList( nullptr )
, nStyleNo( 0 )
{
pSttNd.reset( rPos.MakeNodeIdx() );
@@ -959,7 +956,6 @@ SvxRTFItemStackType::SvxRTFItemStackType(
const EditPosition& rPos,
bool const bCopyAttr )
: aAttrSet( *rCpy.aAttrSet.GetPool(), rCpy.aAttrSet.GetRanges() )
- , m_pChildList( nullptr )
, nStyleNo( rCpy.nStyleNo )
{
pSttNd.reset( rPos.MakeNodeIdx() );
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index e8f4330febe4..84ecb7a0cddd 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -42,8 +42,6 @@ using namespace ::com::sun::star;
SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, bool bOutlText /* = false */ ) :
rOutliner( rOutl ),
bOutlinerText( bOutlText ),
- mpAttribsCache( nullptr ),
- mpParaAttribsCache( nullptr ),
mnParaAttribsCache( 0 )
{
}
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 4e52a5099a9f..38ba0c76d703 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -208,7 +208,7 @@ void CheckSelection( struct ESelection& rSel, SvxEditSource *pEdit ) throw()
UNO3_GETIMPLEMENTATION_IMPL( SvxUnoTextRangeBase );
SvxUnoTextRangeBase::SvxUnoTextRangeBase(const SvxItemPropertySet* _pSet)
- : mpPropSet(_pSet), mpEditSource(nullptr)
+ : mpPropSet(_pSet)
{
}
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 035081d7da43..986781e0773d 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -77,8 +77,7 @@ public:
};
SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine )
-: mpEditEngine( pEditEngine ),
- mpTextForwarder(nullptr)
+: mpEditEngine( pEditEngine )
{
}
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 9424cc55b52d..3342c5a056d7 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -48,8 +48,7 @@ void Interceptor::DisconnectDocHolder()
}
Interceptor::Interceptor( DocumentHolder* pDocHolder )
- : m_pDocHolder( pDocHolder ),
- m_pStatCL(nullptr)
+ : m_pDocHolder( pDocHolder )
{
m_aInterceptedURL[0] = ".uno:Save";
m_aInterceptedURL[1] = ".uno:SaveAll";
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 73c6ffd61a57..02f2e14ac39b 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -46,7 +46,6 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
const uno::Sequence< sal_Int8 >& aClassID,
const OUString& aClassName )
: m_pOleComponent( nullptr )
-, m_pInterfaceContainer( nullptr )
, m_bReadOnly( false )
, m_bDisposed( false )
, m_nObjectState( -1 )
@@ -79,7 +78,6 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
// will be retrieved from the entry, during construction it is unknown
OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, bool bLink )
: m_pOleComponent( nullptr )
-, m_pInterfaceContainer( nullptr )
, m_bReadOnly( false )
, m_bDisposed( false )
, m_nObjectState( -1 )
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 045d9d968036..07e7b317728d 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -576,7 +576,7 @@ Reference<XEventListener> EventAttacherImpl::attachListenerForTarget(
const OUString& aListenerType,
const OUString& aAddListenerParam)
{
- Reference< XEventListener > xRet = nullptr;
+ Reference< XEventListener > xRet;
// Construct the name of the addListener-Method.
sal_Int32 nIndex = aListenerType.lastIndexOf('.');
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 847518e1301a..06db84fa0d76 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -307,7 +307,6 @@ namespace abp
ODataSource::ODataSource( const ODataSource& _rSource )
- :m_pImpl( nullptr )
{
*this = _rSource;
}
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index 7ecf7ab4a05d..d2a49e24a0ab 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -48,7 +48,6 @@ namespace logging
LogHandlerHelper::LogHandlerHelper( const Reference< XComponentContext >& _rxContext, ::osl::Mutex& _rMutex, ::cppu::OBroadcastHelper& _rBHelper )
:m_eEncoding( RTL_TEXTENCODING_UTF8 )
,m_nLevel( LogLevel::SEVERE )
- ,m_xFormatter( nullptr )
,m_xContext( _rxContext )
,m_rMutex( _rMutex )
,m_rBHelper( _rBHelper )
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index b320830ebe7d..821c9ccbb722 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -41,7 +41,6 @@ namespace pcr
OControlFontDialog::OControlFontDialog(const Reference< XComponentContext >& _rxContext )
:OGenericUnoDialog( _rxContext )
- ,m_pFontItems(nullptr)
,m_pItemPool(nullptr)
,m_pItemPoolDefaults(nullptr)
{
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index b6be058570e9..f976aed6e789 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -149,7 +149,6 @@ GridWindow::GridWindow(vcl::Window* pParent)
, m_pXValues(nullptr)
, m_pOrigYValues(nullptr)
, m_nValues(0)
- , m_pNewYValues(nullptr)
, m_BmOffX(0)
, m_BmOffY(0)
, m_bCutValues(false)
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index fb02a8417252..0be0c0a19d93 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -150,7 +150,6 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
}
Sane::Sane() :
- mppOptions( nullptr ),
mnOptions( 0 ),
mnDevice( -1 ),
maHandle( nullptr )
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 3df7b4b40e08..a73033579796 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -211,7 +211,6 @@ SaneDlg::SaneDlg( vcl::Window* pParent, Sane& rSane, bool bScanEnabled ) :
mbScanEnabled( bScanEnabled ),
mnCurrentOption(0),
mnCurrentElement(0),
- mpRange(nullptr),
mfMin(0.0),
mfMax(0.0),
doScan(false)
More information about the Libreoffice-commits
mailing list