Kaydet (Commit) fada813d authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:simplifyconstruct in l10ntools..package

Change-Id: I8dba8ef1e7455af1e55bbd6086b49c0606bf4927
Reviewed-on: https://gerrit.libreoffice.org/60212
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst f6de30f4
......@@ -396,8 +396,7 @@ void CfgExport::WorkOnText(
CfgMerge::CfgMerge(
const OString &rMergeSource, const OString &rOutputFile,
const OString &rFilename, const OString &rLanguage )
: pMergeDataFile( nullptr ),
sFilename( rFilename ),
: sFilename( rFilename ),
bEnglish( false )
{
pOutputStream.open(
......
......@@ -370,7 +370,6 @@ XRMResMerge::XRMResMerge(
const OString &rMergeSource, const OString &rOutputFile,
const OString &rFilename )
: XRMResParser(),
pMergeDataFile( nullptr ),
sFilename( rFilename )
{
if (!rMergeSource.isEmpty() && sLanguage.equalsIgnoreAsciiCase("ALL"))
......
......@@ -246,7 +246,6 @@ class LwpFontAttrManager
public:
LwpFontAttrManager()
: m_nCount(0)
, m_pFontAttrs(nullptr)
{}
~LwpFontAttrManager();
public:
......
......@@ -75,8 +75,6 @@ LwpCharacterBorderOverride::LwpCharacterBorderOverride()
LwpCharacterBorderOverride::LwpCharacterBorderOverride(LwpCharacterBorderOverride const& rOther)
: LwpOverride(rOther)
, m_pBorderStuff(nullptr)
, m_pMargins(nullptr)
, m_nAboveWidth(rOther.m_nAboveWidth)
, m_nBelowWidth(rOther.m_nBelowWidth)
{
......
......@@ -119,7 +119,7 @@ void LwpDLNFVList::ReadName(LwpObjectStream* pObjStrm)
**/
LwpDLNFPVList::LwpDLNFPVList(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
: LwpDLNFVList(objHdr, pStrm),
m_bHasProperties(true),m_pPropList(nullptr)
m_bHasProperties(true)
{}
/**
* @descr Read name of LwpDLNFVList from object stream
......
......@@ -478,7 +478,7 @@ XFFrame* LwpDrawLine::CreateStandardDrawObj(const OUString& rStyleName)
* @param pStream The memory stream which contains the lwp-sdw draw objects
*/
LwpDrawPolyLine::LwpDrawPolyLine(SvStream * pStream, DrawingOffsetAndScale* pTransData)
: LwpDrawObj(pStream, pTransData), m_pVector(nullptr)
: LwpDrawObj(pStream, pTransData)
{
}
LwpDrawPolyLine::~LwpDrawPolyLine()
......
......@@ -245,7 +245,6 @@ void LwpFontTableEntry::RegisterFontDecl()
LwpFontTable::LwpFontTable()
: m_nCount(0)
, m_pFontEntries(nullptr)
{}
void LwpFontTable::Read(LwpObjectStream *pStrm)
......@@ -358,7 +357,6 @@ bool LwpFontNameEntry::IsBackgroundColorOverridden()
LwpFontNameManager::LwpFontNameManager()
: m_nCount(0)
, m_pFontNames(nullptr)
{}
LwpFontNameManager::~LwpFontNameManager()
......
......@@ -760,7 +760,7 @@ void LwpFrameLink::Read(LwpObjectStream* pStrm)
}
LwpFrameLayout::LwpFrameLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
: LwpPlacableLayout(objHdr, pStrm), m_pFrame(nullptr), m_bGettingMaxWidth(false)
: LwpPlacableLayout(objHdr, pStrm), m_bGettingMaxWidth(false)
{
}
......@@ -1021,7 +1021,6 @@ void LwpFrameLayout::ApplyGraphicSize(XFFrame * pXFFrame)
LwpGroupLayout::LwpGroupLayout(LwpObjectHeader const &objHdr, LwpSvStream* pStrm)
: LwpPlacableLayout(objHdr, pStrm)
, m_pFrame(nullptr)
{
}
......
......@@ -91,7 +91,6 @@ LwpFrib::LwpFrib(LwpPara* pPara)
, m_pPara(pPara)
, m_pNext(nullptr)
, m_nFribType(0)
, m_pModifiers(nullptr)
, m_ModFlag(false)
, m_nRevisionType(0)
, m_bRevisionFlag(false)
......
......@@ -100,7 +100,7 @@ void LwpFribColumnBreak::RegisterBreakStyle(LwpPara * pPara)
}
LwpFribPageBreak::LwpFribPageBreak( LwpPara* pPara )
: LwpFrib(pPara), m_bLastFrib(false), m_pMasterPage(nullptr)
: LwpFrib(pPara), m_bLastFrib(false)
{
}
......
......@@ -264,7 +264,6 @@ void LwpColumnInfo:: Read(LwpObjectStream *pStrm)
LwpLayoutColumns::LwpLayoutColumns(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
: LwpVirtualPiece(objHdr, pStrm)
, m_nNumCols(0)
, m_pColumns(nullptr)
{}
LwpLayoutColumns::~LwpLayoutColumns()
......
......@@ -60,7 +60,7 @@
* @descr construct lwpobject from stream
*/
LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm)
: m_ObjHdr(objHdr), m_pObjStrm(nullptr), m_pFoundry(nullptr)
: m_ObjHdr(objHdr), m_pFoundry(nullptr)
, m_pStrm(pStrm), m_bRegisteringStyle(false), m_bParsingStyle(false)
, m_bConvertingContent(false)
{
......
......@@ -363,10 +363,6 @@ LwpSpacingOverride::~LwpSpacingOverride()
LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther)
: LwpOverride(rOther)
, m_pSpacing(nullptr)
, m_pAboveLineSpacing(nullptr)
, m_pParaSpacingAbove(nullptr)
, m_pParaSpacingBelow(nullptr)
{
m_pSpacing.reset( ::clone(rOther.m_pSpacing.get()) );
m_pAboveLineSpacing.reset( ::clone(rOther.m_pAboveLineSpacing.get()) );
......
......@@ -103,8 +103,6 @@ LwpPara::LwpPara(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
, m_nOrdinal(0)
, m_nFlags(0)
, m_nLevel(0)
, m_pBreaks(nullptr)
, m_pIndentOverride(nullptr)
, m_FontID(0)
, m_AllText("")
, m_bHasBullet(false)
......
......@@ -67,7 +67,6 @@
XFCell::XFCell()
: m_pOwnerRow(nullptr)
, m_pSubTable(nullptr)
, m_nCol(0)
, m_nColSpaned(1)
, m_nRepeated(0)
......
......@@ -66,7 +66,6 @@ XFCellStyle::XFCellStyle()
: m_eHoriAlign(enumXFAlignNone)
, m_eVertAlign(enumXFAlignNone)
, m_fTextIndent(0)
, m_pBorders(nullptr)
, m_bWrapText(false)
{}
......
......@@ -60,10 +60,6 @@
#include <xfilter/xfconfigmanager.hxx>
XFConfigManager::XFConfigManager()
: m_pLineNumberConfig(nullptr)
, m_pFootnoteConfig(nullptr)
, m_pEndnoteConfig(nullptr)
{
}
......
......@@ -71,8 +71,6 @@ XFParaStyle::XFParaStyle()
, m_bJustSingleWord(false)
, m_bKeepWithNext(false)
, m_fTextIndent(0)
, m_pBorders(nullptr)
, m_pBGImage(nullptr)
, m_nPageNumber(0)
, m_bNumberLines(true)
, m_nLineNumberRestart(0)
......
......@@ -69,7 +69,7 @@ XFStyleManager::XFStyleManager() : s_aStdArrowStyles( "arrow" ), s_aTextStyles(
s_aParaStyles( "P" ),s_aListStyles( "L" ),s_aSectionStyles( "Sect" ),
s_aPageMasters( "PM" ),s_aMasterpages( "MP" ),s_aDateStyles( "N" ),
s_aGraphicsStyles( "fr" ),s_aTableStyles( "table" ),s_aTableCellStyles( "cell" ),
s_aTableRowStyles( "row" ),s_aTableColStyles( "col" ),s_pOutlineStyle(nullptr)
s_aTableRowStyles( "row" ),s_aTableColStyles( "col" )
{
}
......
......@@ -62,7 +62,6 @@
XFTableStyle::XFTableStyle()
: m_fWidth(2)
, m_pBGImage(nullptr)
, m_eAlign(enumXFAlignStart)
{}
......
......@@ -40,8 +40,7 @@ using namespace ::com::sun::star;
DoubleSequenceContext::DoubleSequenceContext( ContextHandler2Helper& rParent, DataSequenceModel& rModel ) :
DataSequenceContextBase( rParent, rModel ),
mnPtIndex( -1 ),
mpNumberFormatter( nullptr )
mnPtIndex( -1 )
{
}
......
......@@ -61,7 +61,6 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( ContextHandler2Helper cons
const AttributeList& rAttribs, TextBodyProperties& rTextBodyProp )
: ContextHandler2( rParent )
, mrTextBodyProp( rTextBodyProp )
, mpShapePtr( nullptr )
{
// ST_TextWrappingType
sal_Int32 nWrappingType = rAttribs.getToken( XML_wrap, XML_square );
......
......@@ -110,7 +110,6 @@ TextEffectsContext::TextEffectsContext(
std::vector<PropertyValue>& rTextEffectsProperties)
: ContextHandler2(rParent)
, mrTextEffectsProperties(rTextEffectsProperties)
, mpGrabBagStack(nullptr)
, mnCurrentElement(aElementToken)
{
}
......
......@@ -69,7 +69,7 @@ TextParagraphPropertiesPtr TextParagraph::getParagraphStyle(
const TextParagraphPropertiesVector& rListStyle = rTextListStyle.getListStyle();
if (nLevel >= static_cast< sal_Int16 >(rListStyle.size()))
nLevel = 0;
TextParagraphPropertiesPtr pTextParagraphStyle = nullptr;
TextParagraphPropertiesPtr pTextParagraphStyle;
if (rListStyle.size())
pTextParagraphStyle = rListStyle[nLevel];
......
......@@ -326,7 +326,7 @@ Reference< css::frame::XFrame > lcl_getFrame( const Reference< css::frame::XMod
return xFrame;
}
OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : mpControl(nullptr), mpModel( nullptr ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel )
OleFormCtrlExportHelper::OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& rxDocModel, const Reference< XControlModel >& xCntrlModel ) : mpModel( nullptr ), maGrfHelper( rxCtx, lcl_getFrame( rxDocModel ), StorageRef() ), mxDocModel( rxDocModel ), mxControlModel( xCntrlModel )
{
// try to get the guid
Reference< css::beans::XPropertySet > xProps( xCntrlModel, UNO_QUERY );
......
......@@ -59,7 +59,6 @@ PPTShapeGroupContext::PPTShapeGroupContext(
: ShapeGroupContext( rParent, pMasterShapePtr, pGroupShapePtr )
, mpSlidePersistPtr( rSlidePersistPtr )
, meShapeLocation( eShapeLocation )
, pGraphicShape( nullptr )
{
}
......
......@@ -37,7 +37,6 @@ OInputCompStream::OInputCompStream( OWriteStream_Impl& aImpl,
: m_pImpl( &aImpl )
, m_xMutex( m_pImpl->m_xMutex )
, m_xStream( xStream )
, m_pInterfaceContainer( nullptr )
, m_aProperties( aProps )
, m_bDisposed( false )
, m_nStorageType( nStorageType )
......@@ -55,7 +54,6 @@ OInputCompStream::OInputCompStream( uno::Reference < io::XInputStream > const &
: m_pImpl( nullptr )
, m_xMutex( new comphelper::RefCountedMutex )
, m_xStream( xStream )
, m_pInterfaceContainer( nullptr )
, m_aProperties( aProps )
, m_bDisposed( false )
, m_nStorageType( nStorageType )
......
......@@ -55,13 +55,11 @@ struct OHierarchyElement_Impl : public cppu::WeakImplHelper< css::embed::XTransa
public:
explicit OHierarchyElement_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage )
: m_rParent( nullptr )
, m_xOwnStorage( xStorage )
: m_xOwnStorage( xStorage )
{}
explicit OHierarchyElement_Impl( const css::uno::WeakReference< css::embed::XStorage >& xWeakStorage )
: m_rParent( nullptr )
, m_xWeakOwnStorage( xWeakStorage )
: m_xWeakOwnStorage( xWeakStorage )
{}
void Commit();
......
......@@ -64,7 +64,6 @@ SwitchablePersistenceStream::SwitchablePersistenceStream(
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< io::XStream >& xStream )
: m_xContext( xContext )
, m_pStreamData( nullptr )
{
SwitchPersistenceTo( xStream );
}
......@@ -73,7 +72,6 @@ SwitchablePersistenceStream::SwitchablePersistenceStream(
const uno::Reference< uno::XComponentContext >& xContext,
const uno::Reference< io::XInputStream >& xInputStream )
: m_xContext( xContext )
, m_pStreamData( nullptr )
{
SwitchPersistenceTo( xInputStream );
}
......
......@@ -31,8 +31,7 @@ Inflater::Inflater(bool bNoWrap)
bNeedDict(false),
nOffset(0),
nLength(0),
nLastInflateError(0),
pStream(nullptr)
nLastInflateError(0)
{
pStream.reset(new z_stream);
/* memset to 0 to set zalloc/opaque etc */
......
......@@ -48,7 +48,6 @@ using namespace ::com::sun::star;
OZipFileAccess::OZipFileAccess( const uno::Reference< uno::XComponentContext >& rxContext )
: m_aMutexHolder( new comphelper::RefCountedMutex )
, m_xContext( rxContext )
, m_pListenersContainer( nullptr )
, m_bDisposed( false )
, m_bOwnContent( false )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment