From de29ac09535d814e4be7e1bf0f10beb9f0f847e3 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 10 Nov 2015 10:22:39 +0100
Subject: loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
---
sc/inc/address.hxx | 34 +++++++--------
sc/inc/attarray.hxx | 12 ++---
sc/inc/attrib.hxx | 30 ++++++-------
sc/inc/autoform.hxx | 4 +-
sc/inc/chartlis.hxx | 2 +-
sc/inc/chartpos.hxx | 10 ++---
sc/inc/chgtrack.hxx | 30 ++++++-------
sc/inc/chgviset.hxx | 2 +-
sc/inc/colorscale.hxx | 6 +--
sc/inc/column.hxx | 28 ++++++------
sc/inc/compare.hxx | 4 +-
sc/inc/conditio.hxx | 14 +++---
sc/inc/consoli.hxx | 2 +-
sc/inc/dapiuno.hxx | 2 +-
sc/inc/dbdocutl.hxx | 2 +-
sc/inc/defaultsoptions.hxx | 2 +-
sc/inc/dociter.hxx | 2 +-
sc/inc/docoptio.hxx | 2 +-
sc/inc/docpool.hxx | 4 +-
sc/inc/document.hxx | 106 ++++++++++++++++++++++-----------------------
sc/inc/documentimport.hxx | 2 +-
sc/inc/dpfilteredcache.hxx | 2 +-
sc/inc/dpobject.hxx | 12 ++---
sc/inc/dpsave.hxx | 2 +-
sc/inc/dptabres.hxx | 6 +--
sc/inc/drwlayer.hxx | 2 +-
sc/inc/editutil.hxx | 6 +--
sc/inc/externalrefmgr.hxx | 8 ++--
sc/inc/filter.hxx | 4 +-
sc/inc/formulacell.hxx | 4 +-
sc/inc/formulaopt.hxx | 2 +-
sc/inc/global.hxx | 2 +-
sc/inc/listenercontext.hxx | 4 +-
sc/inc/mtvelements.hxx | 8 ++--
sc/inc/patattr.hxx | 34 +++++++--------
sc/inc/postit.hxx | 2 +-
sc/inc/printopt.hxx | 2 +-
sc/inc/rangelst.hxx | 4 +-
sc/inc/rangenam.hxx | 2 +-
sc/inc/rangeutl.hxx | 14 +++---
sc/inc/reffind.hxx | 2 +-
sc/inc/scabstdlg.hxx | 10 ++---
sc/inc/scmatrix.hxx | 2 +-
sc/inc/scmod.hxx | 12 ++---
sc/inc/sharedformula.hxx | 2 +-
sc/inc/styleuno.hxx | 2 +-
sc/inc/table.hxx | 46 ++++++++++----------
sc/inc/token.hxx | 2 +-
sc/inc/viewopti.hxx | 4 +-
49 files changed, 251 insertions(+), 251 deletions(-)
(limited to 'sc/inc')
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index bacbbd5a8be1..aa700d99b6df 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -292,22 +292,22 @@ public:
}
SC_DLLPUBLIC sal_uInt16 Parse(
- const OUString&, ScDocument* = NULL,
+ const OUString&, ScDocument* = nullptr,
const Details& rDetails = detailsOOOa1,
- ExternalInfo* pExtInfo = NULL,
- const css::uno::Sequence<css::sheet::ExternalLinkInfo>* pExternalLinks = NULL );
+ ExternalInfo* pExtInfo = nullptr,
+ const css::uno::Sequence<css::sheet::ExternalLinkInfo>* pExternalLinks = nullptr );
SC_DLLPUBLIC void Format( OStringBuffer& r, sal_uInt16 nFlags = 0,
- const ScDocument* pDocument = NULL,
+ const ScDocument* pDocument = nullptr,
const Details& rDetails = detailsOOOa1) const;
SC_DLLPUBLIC OUString Format( sal_uInt16 nFlags = 0,
- const ScDocument* pDocument = NULL,
+ const ScDocument* pDocument = nullptr,
const Details& rDetails = detailsOOOa1) const;
// The document for the maximum defined sheet number
SC_DLLPUBLIC bool Move( SCsCOL nDeltaX, SCsROW nDeltaY, SCsTAB nDeltaZ,
- ScDocument* pDocument = NULL );
+ ScDocument* pDocument = nullptr );
inline bool operator==( const ScAddress& rAddress ) const;
inline bool operator!=( const ScAddress& rAddress ) const;
@@ -491,16 +491,16 @@ public:
inline bool In( const ScAddress& ) const; ///< is Address& in Range?
inline bool In( const ScRange& ) const; ///< is Range& in Range?
- SC_DLLPUBLIC sal_uInt16 Parse( const OUString&, ScDocument* = NULL,
+ SC_DLLPUBLIC sal_uInt16 Parse( const OUString&, ScDocument* = nullptr,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1,
- ScAddress::ExternalInfo* pExtInfo = NULL,
- const css::uno::Sequence<css::sheet::ExternalLinkInfo>* pExternalLinks = NULL );
+ ScAddress::ExternalInfo* pExtInfo = nullptr,
+ const css::uno::Sequence<css::sheet::ExternalLinkInfo>* pExternalLinks = nullptr );
- SC_DLLPUBLIC sal_uInt16 ParseAny( const OUString&, ScDocument* = NULL,
+ SC_DLLPUBLIC sal_uInt16 ParseAny( const OUString&, ScDocument* = nullptr,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
- SC_DLLPUBLIC sal_uInt16 ParseCols( const OUString&, ScDocument* = NULL,
+ SC_DLLPUBLIC sal_uInt16 ParseCols( const OUString&, ScDocument* = nullptr,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
- SC_DLLPUBLIC sal_uInt16 ParseRows( const OUString&, ScDocument* = NULL,
+ SC_DLLPUBLIC sal_uInt16 ParseRows( const OUString&, ScDocument* = nullptr,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
/** Parse an Excel style reference up to and including the sheet name
@@ -527,16 +527,16 @@ public:
OUString& rExternDocName, OUString& rStartTabName,
OUString& rEndTabName, sal_uInt16& nFlags,
bool bOnlyAcceptSingle,
- const css::uno::Sequence<css::sheet::ExternalLinkInfo>* pExternalLinks = NULL );
+ const css::uno::Sequence<css::sheet::ExternalLinkInfo>* pExternalLinks = nullptr );
- SC_DLLPUBLIC OUString Format(sal_uInt16 nFlags= 0, const ScDocument* pDocument = NULL,
+ SC_DLLPUBLIC OUString Format(sal_uInt16 nFlags= 0, const ScDocument* pDocument = nullptr,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1) const;
inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
SC_DLLPUBLIC void PutInOrder();
// The document for the maximum defined sheet number
- SC_DLLPUBLIC bool Move( SCsCOL aDeltaX, SCsROW aDeltaY, SCsTAB aDeltaZ, ScDocument* pDocument = NULL );
+ SC_DLLPUBLIC bool Move( SCsCOL aDeltaX, SCsROW aDeltaY, SCsTAB aDeltaZ, ScDocument* pDocument = nullptr );
SC_DLLPUBLIC void ExtendTo( const ScRange& rRange );
SC_DLLPUBLIC bool Intersects( const ScRange& rRange ) const; // do two ranges intersect?
@@ -852,13 +852,13 @@ template< typename T > void PutInOrder( T& nStart, T& nEnd )
bool ConvertSingleRef( ScDocument* pDocument, const OUString& rRefString,
SCTAB nDefTab, ScRefAddress& rRefAddress,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1,
- ScAddress::ExternalInfo* pExtInfo = NULL );
+ ScAddress::ExternalInfo* pExtInfo = nullptr );
bool ConvertDoubleRef( ScDocument* pDocument, const OUString& rRefString,
SCTAB nDefTab, ScRefAddress& rStartRefAddress,
ScRefAddress& rEndRefAddress,
const ScAddress::Details& rDetails = ScAddress::detailsOOOa1,
- ScAddress::ExternalInfo* pExtInfo = NULL );
+ ScAddress::ExternalInfo* pExtInfo = nullptr );
/// append alpha representation of column to buffer
SC_DLLPUBLIC void ScColToAlpha( OUStringBuffer& rBuffer, SCCOL nCol);
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 1b0a646d5ee9..6dd84817b134 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -63,7 +63,7 @@ struct ScMergePatternState
const ScPatternAttr* pOld1; ///< existing objects, temporary
const ScPatternAttr* pOld2;
- ScMergePatternState() : pItemSet(NULL), pOld1(NULL), pOld2(NULL) {}
+ ScMergePatternState() : pItemSet(nullptr), pOld1(nullptr), pOld2(nullptr) {}
};
struct ScAttrEntry
@@ -121,10 +121,10 @@ public:
void SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool = false );
void SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pPattern,
- bool bPutToPool = false, ScEditDataArray* pDataArray = NULL );
+ bool bPutToPool = false, ScEditDataArray* pDataArray = nullptr );
void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle );
void ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache,
- ScEditDataArray* pDataArray = NULL );
+ ScEditDataArray* pDataArray = nullptr );
bool SetAttrEntries(ScAttrEntry* pNewData, SCSIZE nSize);
void ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow,
const ::editeng::SvxBorderLine* pLine, bool bColorOnly );
@@ -142,11 +142,11 @@ public:
/// May return -1 if not found
SCsROW SearchStyle(
SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp,
- const ScMarkArray* pMarkArray = NULL) const;
+ const ScMarkArray* pMarkArray = nullptr) const;
bool SearchStyleRange(
SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
- const ScMarkArray* pMarkArray = NULL) const;
+ const ScMarkArray* pMarkArray = nullptr) const;
bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
bool RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
@@ -233,7 +233,7 @@ inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom )
++nPos;
}
else
- pRet = NULL;
+ pRet = nullptr;
return pRet;
}
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index a1721ea85dca..5c9070b84933 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -57,7 +57,7 @@ public:
virtual ~ScMergeAttr();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
SCsCOL GetColMerge() const {return nColMerge; }
@@ -116,10 +116,10 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString& rText,
- const IntlWrapper* pIntl = 0 ) const override;
+ const IntlWrapper* pIntl = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
@@ -166,8 +166,8 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ const IntlWrapper* pIntl = nullptr ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
private:
ScRange aRange;
@@ -215,8 +215,8 @@ public:
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper* pIntl = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ const IntlWrapper* pIntl = nullptr ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
public:
sal_uInt16 nCount;
@@ -224,7 +224,7 @@ public:
};
inline ScTableListItem::ScTableListItem( const sal_uInt16 nWhichP )
- : SfxPoolItem(nWhichP), nCount(0), pTabArr(NULL)
+ : SfxPoolItem(nWhichP), nCount(0), pTabArr(nullptr)
{}
// page format item: contents of header and footer
@@ -246,7 +246,7 @@ public:
virtual ~ScPageHFItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
@@ -277,14 +277,14 @@ public:
virtual ~ScViewObjectModeItem();
virtual sal_uInt16 GetValueCount() const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override;
virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString& rText,
- const IntlWrapper* pIntl = 0 ) const override;
+ const IntlWrapper* pIntl = nullptr ) const override;
};
class ScDoubleItem : public SfxPoolItem
@@ -296,7 +296,7 @@ public:
virtual ~ScDoubleItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
@@ -321,7 +321,7 @@ public:
virtual ~ScPageScaleToItem();
- virtual ScPageScaleToItem* Clone( SfxItemPool* = 0 ) const override;
+ virtual ScPageScaleToItem* Clone( SfxItemPool* = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& rCmp ) const override;
@@ -338,7 +338,7 @@ public:
SfxItemPresentation ePresentation,
SfxMapUnit, SfxMapUnit,
OUString& rText,
- const IntlWrapper* = 0 ) const override;
+ const IntlWrapper* = nullptr ) const override;
virtual bool QueryValue( css::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rAny, sal_uInt8 nMemberId ) override;
@@ -359,7 +359,7 @@ public:
virtual ~ScCondFormatItem();
virtual bool operator==(const SfxPoolItem& rCmp ) const override;
- virtual ScCondFormatItem* Clone( SfxItemPool* = 0 ) const override;
+ virtual ScCondFormatItem* Clone( SfxItemPool* = nullptr ) const override;
const std::vector<sal_uInt32>& GetCondFormatData() const { return maIndex;}
void AddCondFormatData( sal_uInt32 nIndex );
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index ffdc8cedbbe3..a290aca170a8 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -75,7 +75,7 @@ struct AutoFormatSwBlob : ::boost::noncopyable
sal_uInt8 *pData;
sal_Size size;
- AutoFormatSwBlob() : pData(0), size(0)
+ AutoFormatSwBlob() : pData(nullptr), size(0)
{
}
@@ -87,7 +87,7 @@ struct AutoFormatSwBlob : ::boost::noncopyable
void Reset()
{
delete[] pData;
- pData = 0;
+ pData = nullptr;
size = 0;
}
};
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index 3bc0fb8bf30f..8671f182e5e8 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -88,7 +88,7 @@ public:
css::uno::Reference< css::chart::XChartDataChangeEventListener > GetUnoListener() const;
css::uno::Reference< css::chart::XChartData > GetUnoSource() const;
- bool IsUno() const { return (pUnoData != NULL); }
+ bool IsUno() const { return (pUnoData != nullptr); }
virtual void Notify( const SfxHint& rHint ) override;
void StartListeningTo();
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index 33eba6a1b88d..75e2e14bcadc 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -65,7 +65,7 @@ public:
{
if ( nIndex < nCount )
return ppData[ nIndex ];
- return NULL;
+ return nullptr;
}
//! might be NULL indicating "no value"
@@ -73,19 +73,19 @@ public:
{
if ( IsValid( nChartCol, nChartRow ) )
return ppData[ GetIndex( nChartCol, nChartRow ) ];
- return NULL;
+ return nullptr;
}
const ScAddress* GetColHeaderPosition( SCCOL nChartCol ) const
{
if ( nChartCol < nColCount )
return ppColHeader[ nChartCol ];
- return NULL;
+ return nullptr;
}
const ScAddress* GetRowHeaderPosition( SCROW nChartRow ) const
{
if ( nChartRow < nRowCount )
return ppRowHeader[ nChartRow ];
- return NULL;
+ return nullptr;
}
};
@@ -141,7 +141,7 @@ public:
if ( pPositionMap )
{
delete pPositionMap;
- pPositionMap = NULL;
+ pPositionMap = nullptr;
}
}
const ScChartPositionMap* GetPositionMap();
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index da827c8556df..2cdc14b2d1c2 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -116,7 +116,7 @@ public:
: pNext( *ppPrevP ),
ppPrev( ppPrevP ),
pAction( pActionP ),
- pLink( NULL )
+ pLink( nullptr )
{
if ( pNext )
pNext->ppPrev = &pNext;
@@ -146,8 +146,8 @@ public:
{
if ( pLink )
{
- pLink->pLink = NULL;
- pLink = NULL;
+ pLink->pLink = nullptr;
+ pLink = nullptr;
}
}
@@ -155,9 +155,9 @@ public:
{
if ( ppPrev )
{
- if ( ( *ppPrev = pNext ) != NULL )
+ if ( ( *ppPrev = pNext ) != nullptr )
pNext->ppPrev = ppPrev;
- ppPrev = NULL; // not inserted
+ ppPrev = nullptr; // not inserted
}
}
@@ -413,7 +413,7 @@ class ScChangeActionIns : public ScChangeAction
virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const override { return 0; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return nullptr; }
public:
ScChangeActionIns(
@@ -552,7 +552,7 @@ class ScChangeActionMove : public ScChangeAction
: ScChangeAction( SC_CAT_MOVE, rToRange ),
aFromRange( rFromRange ),
pTrack( pTrackP ),
- pFirstCell( NULL ),
+ pFirstCell( nullptr ),
nStartLastCut(0),
nEndLastCut(0)
{}
@@ -652,7 +652,7 @@ class ScChangeActionContent : public ScChangeAction
if ( !ppPrevInSlot )
{
ppPrevInSlot = pp;
- if ( ( pNextInSlot = *pp ) != NULL )
+ if ( ( pNextInSlot = *pp ) != nullptr )
pNextInSlot->ppPrevInSlot = &pNextInSlot;
*pp = this;
}
@@ -662,9 +662,9 @@ class ScChangeActionContent : public ScChangeAction
{
if ( ppPrevInSlot )
{
- if ( ( *ppPrevInSlot = pNextInSlot ) != NULL )
+ if ( ( *ppPrevInSlot = pNextInSlot ) != nullptr )
pNextInSlot->ppPrevInSlot = ppPrevInSlot;
- ppPrevInSlot = NULL; // not inserted
+ ppPrevInSlot = nullptr; // not inserted
}
}
@@ -706,7 +706,7 @@ class ScChangeActionContent : public ScChangeAction
virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const override { return 0; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return nullptr; }
// pRejectActions!=NULL: reject actions get
// stacked, no SetNewValue, no Append
@@ -742,7 +742,7 @@ public:
ScChangeActionContent* GetNextContent() const { return pNextContent; }
ScChangeActionContent* GetPrevContent() const { return pPrevContent; }
ScChangeActionContent* GetTopContent() const;
- bool IsTopContent() const { return pNextContent == NULL; }
+ bool IsTopContent() const { return pNextContent == nullptr; }
virtual ScChangeActionLinkEntry* GetDeletedIn() const override;
virtual ScChangeActionLinkEntry** GetDeletedInAddress() override;
@@ -816,7 +816,7 @@ class ScChangeActionReject : public ScChangeAction
virtual bool Reject(ScDocument* pDoc) override;
- virtual const ScChangeTrack* GetChangeTrack() const override { return 0; }
+ virtual const ScChangeTrack* GetChangeTrack() const override { return nullptr; }
public:
ScChangeActionReject(const sal_uLong nActionNumber,
@@ -1072,7 +1072,7 @@ public:
// old value from pOldCell, nOldFormat,
// RefDoc==NULL => Doc
void AppendContent( const ScAddress& rPos, const ScCellValue& rOldCell,
- sal_uLong nOldFormat, ScDocument* pRefDoc = NULL );
+ sal_uLong nOldFormat, ScDocument* pRefDoc = nullptr );
// after new value was set in the document,
// old value from pOldCell, format from Doc
SC_DLLPUBLIC void AppendContent( const ScAddress& rPos, const ScCellValue& rOldCell );
@@ -1111,7 +1111,7 @@ public:
if ( pLastCutMove )
{
delete pLastCutMove;
- pLastCutMove = NULL;
+ pLastCutMove = nullptr;
}
}
bool HasLastCut() const
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index 14bfdf3922de..61bf99131c6c 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -56,7 +56,7 @@ private:
public:
ScChangeViewSettings()
- : pCommentSearcher(NULL)
+ : pCommentSearcher(nullptr)
, aFirstDateTime(DateTime::EMPTY)
, aLastDateTime(DateTime::EMPTY)
, eDateMode(SvxRedlinDateMode::BEFORE)
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index a8d9f1f5f225..a593e4ddaf78 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -260,7 +260,7 @@ public:
ScColorScaleFormat(ScDocument* pDoc);
ScColorScaleFormat(ScDocument* pDoc, const ScColorScaleFormat& rFormat);
virtual ~ScColorScaleFormat();
- virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const override;
+ virtual ScColorFormat* Clone(ScDocument* pDoc = nullptr) const override;
Color* GetColor(const ScAddress& rAddr) const;
void AddEntry(ScColorScaleEntry* pEntry);
@@ -295,7 +295,7 @@ class SC_DLLPUBLIC ScDataBarFormat : public ScColorFormat
public:
ScDataBarFormat(ScDocument* pDoc);
ScDataBarFormat(ScDocument* pDoc, const ScDataBarFormat& rFormat);
- virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const override;
+ virtual ScColorFormat* Clone(ScDocument* pDoc = nullptr) const override;
ScDataBarInfo* GetDataBarInfo(const ScAddress& rAddr) const;
@@ -357,7 +357,7 @@ public:
ScIconSetFormat(ScDocument* pDoc);
ScIconSetFormat(ScDocument* pDoc, const ScIconSetFormat& rFormat);
- virtual ScColorFormat* Clone(ScDocument* pDoc = NULL) const override;
+ virtual ScColorFormat* Clone(ScDocument* pDoc = nullptr) const override;
ScIconSetInfo* GetIconSetInfo(const ScAddress& rAddr) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7817df6fb38f..69cb0366fccb 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -250,11 +250,11 @@ public:
* @param pGroupPos when non-NULL, stores the top position of formula
* group that's been merged as a result of row deletion.
*/
- void DeleteRow( SCROW nStartRow, SCSIZE nSize, std::vector<ScAddress>* pGroupPos = NULL );
+ void DeleteRow( SCROW nStartRow, SCSIZE nSize, std::vector<ScAddress>* pGroupPos = nullptr );
void DeleteArea(
SCROW nStartRow, SCROW nEndRow, InsertDeleteFlags nDelFlag,
- bool bBroadcast = true, sc::ColumnSpanSet* pBroadcastSpans = NULL );
+ bool bBroadcast = true, sc::ColumnSpanSet* pBroadcastSpans = nullptr );
void DeleteRanges( const std::vector<sc::RowSpan>& rRanges, InsertDeleteFlags nDelFlag, bool bBroadcast );
@@ -293,11 +293,11 @@ public:
void CopyToColumn(
sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, InsertDeleteFlags nFlags, bool bMarked,
- ScColumn& rColumn, const ScMarkData* pMarkData = NULL, bool bAsLink = false) const;
+ ScColumn& rColumn, const ScMarkData* pMarkData = nullptr, bool bAsLink = false) const;
void UndoToColumn(
sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, InsertDeleteFlags nFlags, bool bMarked,
- ScColumn& rColumn, const ScMarkData* pMarkData = NULL) const;
+ ScColumn& rColumn, const ScMarkData* pMarkData = nullptr) const;
void CopyScenarioFrom( const ScColumn& rSrcCol );
void CopyScenarioTo( ScColumn& rDestCol ) const;
@@ -313,7 +313,7 @@ public:
bool SetString(
SCROW nRow, SCTAB nTab, const OUString& rString, formula::FormulaGrammar::AddressConvention eConv,
- ScSetStringParam* pParam = NULL );
+ ScSetStringParam* pParam = nullptr );
void SetEditText( SCROW nRow, EditTextObject* pEditText );
void SetEditText( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, EditTextObject* pEditText );
@@ -397,7 +397,7 @@ public:
void ResetChanged( SCROW nStartRow, SCROW nEndRow );
- bool UpdateReferenceOnCopy( const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = NULL );
+ bool UpdateReferenceOnCopy( const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr );
/**
* Update reference addresses in formula cell in response to mass cell
@@ -406,7 +406,7 @@ public:
* @return true if reference of at least one formula cell has been
* updated, false otherwise.
*/
- bool UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = NULL );
+ bool UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr );
void UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt );
void UpdateInsertTabOnlyCells( sc::RefUpdateInsertTabContext& rCxt );
@@ -447,7 +447,7 @@ public:
void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr );
void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr,
- ScEditDataArray* pDataArray = NULL );
+ ScEditDataArray* pDataArray = nullptr );
void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool = false );
void SetPatternArea( SCROW nStartRow, SCROW nEndRow,
const ScPatternAttr& rPatAttr, bool bPutToPool = false );
@@ -484,7 +484,7 @@ public:
void RemoveProtected( SCROW nStartRow, SCROW nEndRow );
- SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
+ SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = nullptr );
void DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast );
void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
@@ -518,11 +518,11 @@ public:
void StartListeningFormulaCells(
sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt, SCROW nRow1, SCROW nRow2,
- SCROW* pStartRow = NULL, SCROW* pEndRow = NULL );
+ SCROW* pStartRow = nullptr, SCROW* pEndRow = nullptr );
void EndListeningFormulaCells(
sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2,
- SCROW* pStartRow = NULL, SCROW* pEndRow = NULL );
+ SCROW* pStartRow = nullptr, SCROW* pEndRow = nullptr );
void StartListening( SvtListener& rLst, SCROW nRow );
void EndListening( SvtListener& rLst, SCROW nRow );
@@ -627,7 +627,7 @@ public:
/**
* Regroup formula cells for the entire column.
*/
- void RegroupFormulaCells( std::vector<ScAddress>* pGroupPos = NULL );
+ void RegroupFormulaCells( std::vector<ScAddress>* pGroupPos = nullptr );
/**
* Reset column position of formula cells within specified row range.
@@ -707,10 +707,10 @@ private:
std::vector<sc::FormulaGroupEntry> GetFormulaGroupEntries();
void EndListeningIntersectedGroup(
- sc::EndListeningContext& rCxt, SCROW nRow, std::vector<ScAddress>* pGroupPos = NULL );
+ sc::EndListeningContext& rCxt, SCROW nRow, std::vector<ScAddress>* pGroupPos = nullptr );
void EndListeningIntersectedGroups(
- sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, std::vector<ScAddress>* pGroupPos = NULL );
+ sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, std::vector<ScAddress>* pGroupPos = nullptr );
void EndListeningGroup( sc::EndListeningContext& rCxt, SCROW nRow );
void SetNeedsListeningGroup( SCROW nRow );
diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index 19e2a4155e97..adfdfbc67597 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -67,8 +67,8 @@ private:
Case sensitivity document option is always to be passed in
rComp.mbIgnoreCase.
*/
-double CompareFunc( const Compare& rComp, CompareOptions* pOptions = NULL );
-double CompareFunc( const Compare::Cell& rCell1, double fCell2, CompareOptions* pOptions = NULL );
+double CompareFunc( const Compare& rComp, CompareOptions* pOptions = nullptr );
+double CompareFunc( const Compare::Cell& rCell1, double fCell2, CompareOptions* pOptions = nullptr );
double CompareFunc( double fCell1, double fCell2 );
/**
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 026efb171981..d33ecc6fd8aa 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -104,9 +104,9 @@ enum ScFormatEntryType
struct ScCondFormatData
{
ScCondFormatData():
- pColorScale(NULL),
- pDataBar(NULL),
- pIconSet(NULL) {}
+ pColorScale(nullptr),
+ pDataBar(nullptr),
+ pIconSet(nullptr) {}
Color* pColorScale;
ScDataBarInfo* pDataBar;
@@ -126,7 +126,7 @@ public:
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt ) = 0;
virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) = 0;
- virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const = 0;
+ virtual ScFormatEntry* Clone( ScDocument* pDoc = nullptr ) const = 0;
virtual void SetParent( ScConditionalFormat* pNew ) = 0;
@@ -240,7 +240,7 @@ public:
virtual condformat::ScFormatEntryType GetType() const override { return condformat::CONDITION; }
- virtual ScFormatEntry* Clone(ScDocument* pDoc = NULL) const override;
+ virtual ScFormatEntry* Clone(ScDocument* pDoc = nullptr) const override;
static ScConditionMode GetModeFromApi(sal_Int32 nOperator);
@@ -358,7 +358,7 @@ public:
virtual void UpdateDeleteTab( sc::RefUpdateDeleteTabContext& ) override {}
virtual void UpdateMoveTab( sc::RefUpdateMoveTabContext& ) override {}
- virtual ScFormatEntry* Clone( ScDocument* pDoc = NULL ) const override;
+ virtual ScFormatEntry* Clone( ScDocument* pDoc = nullptr ) const override;
virtual void SetParent( ScConditionalFormat* ) override {}
@@ -390,7 +390,7 @@ public:
~ScConditionalFormat();
// true copy of formulas (for Ref-Undo / between documents)
- ScConditionalFormat* Clone(ScDocument* pNewDoc = NULL) const;
+ ScConditionalFormat* Clone(ScDocument* pNewDoc = nullptr) const;
void AddEntry( ScFormatEntry* pNew );
void RemoveEntry(size_t nIndex);
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 3b1b65d89862..9d994710b7b2 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -42,7 +42,7 @@ private:
ScReferenceEntry* pData;
public:
- void Init() { nCount=0; nFullSize=0; pData=NULL; }
+ void Init() { nCount=0; nFullSize=0; pData=nullptr; }
void Clear() { delete[] pData; }
SCSIZE GetCount() { return nCount; }
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index bc0ec6105977..8d7b324fee8f 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -393,7 +393,7 @@ protected:
void SetDPObject( ScDPObject* pDPObject );
/** Returns the DataPilot dimension object related to the field described by maFieldId. */
- ScDPSaveDimension* GetDPDimension( ScDPObject** ppDPObject = 0 ) const;
+ ScDPSaveDimension* GetDPDimension( ScDPObject** ppDPObject = nullptr ) const;
/** Returns the number of members for the field described by maFieldId. */
sal_Int32 GetMemberCount() const;
diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx
index fc0dfd303dc0..deddb108b4a4 100644
--- a/sc/inc/dbdocutl.hxx
+++ b/sc/inc/dbdocutl.hxx
@@ -45,7 +45,7 @@ public:
static void PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
const css::uno::Reference< css::sdbc::XRow>& xRow,
long nRowPos,
- long nType, bool bCurrency, StrData* pStrData = NULL );
+ long nType, bool bCurrency, StrData* pStrData = nullptr );
};
#endif
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index db992ac8542e..7157db86c80b 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -52,7 +52,7 @@ public:
virtual ~ScTpDefaultsItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const ScDefaultsOptions& GetDefaultsOptions() const { return theOptions; }
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 858c204be7bb..adc76796b4b5 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -595,7 +595,7 @@ public:
*/
explicit ScDocRowHeightUpdater(
ScDocument& rDoc, OutputDevice* pOutDev, double fPPTX, double fPPTY,
- const ::std::vector<TabRanges>* pTabRangesArray = NULL);
+ const ::std::vector<TabRanges>* pTabRangesArray = nullptr);
void update();
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 8ab144d83e40..995fc26736fe 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -157,7 +157,7 @@ public:
virtual ~ScTpCalcItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const ScDocOptions& GetDocOptions() const { return theOptions; }
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index bd1cba625838..bbe2e84a70ba 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -45,7 +45,7 @@ class SC_DLLPUBLIC ScDocumentPool: public SfxItemPool
static sal_uInt16* pVersionMap12;
public:
- ScDocumentPool( SfxItemPool* pSecPool = NULL );
+ ScDocumentPool( SfxItemPool* pSecPool = nullptr );
protected:
virtual ~ScDocumentPool();
public:
@@ -63,7 +63,7 @@ public:
const SfxPoolItem& rItem,
SfxMapUnit ePresentationMetric,
OUString& rText,
- const IntlWrapper* pIntl = 0 ) const override;
+ const IntlWrapper* pIntl = nullptr ) const override;
static void InitVersionMaps();
static void DeleteVersionMaps();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 83f12bc53912..fc13ec9cf5f1 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -484,7 +484,7 @@ public:
// number formatter
public:
SC_DLLPUBLIC ScDocument( ScDocumentMode eMode = SCDOCMODE_DOCUMENT,
- SfxObjectShell* pDocShell = NULL );
+ SfxObjectShell* pDocShell = nullptr );
SC_DLLPUBLIC ~ScDocument();
void SetName( const OUString& r ) { aDocName = r; }
@@ -494,7 +494,7 @@ public:
void GetDocStat( ScDocStat& rDocStat );
- SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL );
+ SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = nullptr );
rtl::Reference<XColorList> GetColorList();
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager();
@@ -571,7 +571,7 @@ public:
ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
void RefreshDirtyTableColumnNames();
- SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange& rBlock, OUString* pName=NULL ) const;
+ SC_DLLPUBLIC const ScRangeData* GetRangeAtBlock( const ScRange& rBlock, OUString* pName=nullptr ) const;
SC_DLLPUBLIC bool HasPivotTable() const;
SC_DLLPUBLIC ScDPCollection* GetDPCollection();
@@ -646,9 +646,9 @@ public:
bool IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
- bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool* pOnlyNotBecauseOfMatrix = nullptr ) const;
bool IsSelectionEditable( const ScMarkData& rMark,
- bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool* pOnlyNotBecauseOfMatrix = nullptr ) const;
bool HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark ) const;
@@ -682,9 +682,9 @@ public:
SC_DLLPUBLIC bool RenameTab( SCTAB nTab, const OUString& rName,
bool bUpdateRef = true,
bool bExternalDocument = false );
- bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = NULL );
+ bool MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress = nullptr );
bool CopyTab( SCTAB nOldPos, SCTAB nNewPos,
- const ScMarkData* pOnlyMarked = NULL );
+ const ScMarkData* pOnlyMarked = nullptr );
SC_DLLPUBLIC sal_uLong TransferTab(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos,
bool bInsertNew = true,
bool bResultsOnly = false );
@@ -793,7 +793,7 @@ public:
void BeginDrawUndo();
void BeginUnoRefUndo();
- bool HasUnoRefUndo() const { return ( pUnoRefUndoList != NULL ); }
+ bool HasUnoRefUndo() const { return ( pUnoRefUndoList != nullptr ); }
ScUnoRefList* EndUnoRefUndo(); // must be deleted by caller!
sal_Int64 GetNewUnoId() { return ++nUnoObjectId; }
void AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges );
@@ -840,8 +840,8 @@ public:
// return TRUE = number format is set
SC_DLLPUBLIC bool SetString(
SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString,
- ScSetStringParam* pParam = NULL );
- SC_DLLPUBLIC bool SetString( const ScAddress& rPos, const OUString& rString, ScSetStringParam* pParam = NULL );
+ ScSetStringParam* pParam = nullptr );
+ SC_DLLPUBLIC bool SetString( const ScAddress& rPos, const OUString& rString, ScSetStringParam* pParam = nullptr );
/**
* This method manages the lifecycle of the passed edit text object. When
@@ -904,7 +904,7 @@ public:
SCCOL nCol2, SCROW nRow2,
const ScMarkData& rMark,
const OUString& rFormula,
- const ScTokenArray* p = NULL,
+ const ScTokenArray* p = nullptr,
const formula::FormulaGrammar::Grammar = formula::FormulaGrammar::GRAM_DEFAULT,
bool bDirtyFlag=true );
SC_DLLPUBLIC void InsertTableOp(const ScTabOpParam& rParam, // multi-operation
@@ -1022,8 +1022,8 @@ public:
bool IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
bool bLeftIsEmpty = false,
- ScRange* pLastRange = NULL,
- Rectangle* pLastMM = NULL ) const;
+ ScRange* pLastRange = nullptr,
+ Rectangle* pLastMM = nullptr ) const;
void SkipOverlapped( SCCOL& rCol, SCROW& rRow, SCTAB nTab ) const;
bool IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const;
@@ -1198,28 +1198,28 @@ public:
bool InsertRow( SCCOL nStartCol, SCTAB nStartTab,
SCCOL nEndCol, SCTAB nEndTab,
- SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL,
- const ScMarkData* pTabMark = NULL );
- SC_DLLPUBLIC bool InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
+ SCROW nStartRow, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr,
+ const ScMarkData* pTabMark = nullptr );
+ SC_DLLPUBLIC bool InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc = nullptr );
void DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
SCCOL nEndCol, SCTAB nEndTab,
SCROW nStartRow, SCSIZE nSize,
- ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL,
- const ScMarkData* pTabMark = NULL );
+ ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr,
+ const ScMarkData* pTabMark = nullptr );
SC_DLLPUBLIC void DeleteRow( const ScRange& rRange,
- ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL );
+ ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr );
bool InsertCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
- SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL,
- const ScMarkData* pTabMark = NULL );
- SC_DLLPUBLIC bool InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = NULL );
+ SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = nullptr,
+ const ScMarkData* pTabMark = nullptr );
+ SC_DLLPUBLIC bool InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc = nullptr );
void DeleteCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
SCCOL nStartCol, SCSIZE nSize,
- ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL,
- const ScMarkData* pTabMark = NULL );
+ ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr,
+ const ScMarkData* pTabMark = nullptr );
void DeleteCol( const ScRange& rRange,
- ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL );
+ ScDocument* pRefUndoDoc = nullptr, bool* pUndoOutline = nullptr );
bool CanInsertRow( const ScRange& rRange ) const;
bool CanInsertCol( const ScRange& rRange ) const;
@@ -1252,7 +1252,7 @@ public:
SC_DLLPUBLIC bool IsDocVisible() const { return bIsVisible; }
void SetDocVisible( bool bSet );
- bool HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = NULL );
+ bool HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark = nullptr );
void DeleteObjectsInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
const ScMarkData& rMark );
@@ -1261,14 +1261,14 @@ public:
void DeleteArea(
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark,
InsertDeleteFlags nDelFlag, bool bBroadcast = true,
- sc::ColumnSpanSet* pBroadcastSpans = NULL );
+ sc::ColumnSpanSet* pBroadcastSpans = nullptr );
SC_DLLPUBLIC void DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCTAB nTab, InsertDeleteFlags nDelFlag);
void DeleteAreaTab(const ScRange& rRange, InsertDeleteFlags nDelFlag);
void CopyToClip(const ScClipParam& rClipParam, ScDocument* pClipDoc,
- const ScMarkData* pMarks = NULL, bool bAllTabs = false, bool bKeepScenarioFlags = false,
+ const ScMarkData* pMarks = nullptr, bool bAllTabs = false, bool bKeepScenarioFlags = false,
bool bIncludeObjects = false, bool bCloneNoteCaptions = true, bool bUseRangeForVBA = false );
/**
@@ -1292,7 +1292,7 @@ public:
void CopyCellToDocument( const ScAddress& rSrcPos, const ScAddress& rDestPos, ScDocument& rDestDoc );
void CopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- SCTAB nTab, ScDocument* pClipDoc = NULL);
+ SCTAB nTab, ScDocument* pClipDoc = nullptr);
bool InitColumnBlockPosition( sc::ColumnBlockPosition& rBlokPos, SCTAB nTab, SCCOL nCol );
@@ -1320,13 +1320,13 @@ public:
case is the overall encompassing range. */
void CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark,
InsertDeleteFlags nInsFlag,
- ScDocument* pRefUndoDoc = NULL,
- ScDocument* pClipDoc = NULL,
+ ScDocument* pRefUndoDoc = nullptr,
+ ScDocument* pClipDoc = nullptr,
bool bResetCut = true,
bool bAsLink = false,
bool bIncludeFiltered = true,
bool bSkipAttrForEmpty = false,
- const ScRangeList * pDestRanges = NULL );
+ const ScRangeList * pDestRanges = nullptr );
void CopyMultiRangeFromClip(const ScAddress& rDestPos, const ScMarkData& rMark,
InsertDeleteFlags nInsFlag, ScDocument* pClipDoc,
@@ -1369,18 +1369,18 @@ public:
void CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc,
- const ScMarkData* pMarks = NULL, bool bColRowFlags = true);
+ const ScMarkData* pMarks = nullptr, bool bColRowFlags = true);
void UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc,
- const ScMarkData* pMarks = NULL);
+ const ScMarkData* pMarks = nullptr);
void CopyToDocument(const ScRange& rRange,
InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc,
- const ScMarkData* pMarks = NULL, bool bColRowFlags = true);
+ const ScMarkData* pMarks = nullptr, bool bColRowFlags = true);
void UndoToDocument(const ScRange& rRange,
InsertDeleteFlags nFlags, bool bMarked, ScDocument* pDestDoc,
- const ScMarkData* pMarks = NULL);
+ const ScMarkData* pMarks = nullptr);
void CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, bool bNewScenario = false );
bool TestCopyScenario( SCTAB nSrcTab, SCTAB nDestTab ) const;
@@ -1393,11 +1393,11 @@ public:
SC_DLLPUBLIC void CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc );
void UpdateReference(
- sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = NULL, bool bIncludeDraw = true,
+ sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr, bool bIncludeDraw = true,
bool bUpdateNoteCaptionPos = true );
SC_DLLPUBLIC void UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDoc,
- const ScMarkData& rMark, ScDocument* pUndoDoc = NULL );
+ const ScMarkData& rMark, ScDocument* pUndoDoc = nullptr );
void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
@@ -1480,7 +1480,7 @@ public:
SC_DLLPUBLIC void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark, const ScPatternAttr& rAttr,
- ScEditDataArray* pDataArray = NULL );
+ ScEditDataArray* pDataArray = nullptr );
SC_DLLPUBLIC void ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, SCTAB nTab,
const ScPatternAttr& rAttr );
@@ -1531,7 +1531,7 @@ public:
bool SearchAndReplace( const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW& rRow, SCTAB& rTab,
const ScMarkData& rMark, ScRangeList& rMatchedRanges,
- OUString& rUndoStr, ScDocument* pUndoDoc = NULL );
+ OUString& rUndoStr, ScDocument* pUndoDoc = nullptr );
// determine Col/Row of subsequent calls
// (e.g. not found from the beginning, or subsequent tables)
@@ -1544,7 +1544,7 @@ public:
const OUString& sValStr, double& nX);
SC_DLLPUBLIC void ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark,
- ScEditDataArray* pDataArray = NULL );
+ ScEditDataArray* pDataArray = nullptr );
void DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast = true );
void DeleteSelectionTab( SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast = true );
@@ -1579,13 +1579,13 @@ public:
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
bool bFormula,
- const ScMarkData* pMarkData = NULL,
- const ScColWidthParam* pParam = NULL );
+ const ScMarkData* pMarkData = nullptr,
+ const ScColWidthParam* pParam = nullptr );
SC_DLLPUBLIC bool SetOptimalHeight(
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, SCTAB nTab );
- void UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkData* pTabMark = NULL );
+ void UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkData* pTabMark = nullptr );
long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
OutputDevice* pDev,
@@ -1613,18 +1613,18 @@ public:
css::uno::Sequence<
css::sheet::TablePageBreakData> GetRowBreakData(SCTAB nTab) const;
- SC_DLLPUBLIC bool RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const;
+ SC_DLLPUBLIC bool RowHidden(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
SC_DLLPUBLIC bool HasHiddenRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
- SC_DLLPUBLIC bool ColHidden(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL) const;
+ SC_DLLPUBLIC bool ColHidden(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = nullptr, SCCOL* pLastCol = nullptr) const;
SC_DLLPUBLIC void SetRowHidden(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHidden);
SC_DLLPUBLIC void SetColHidden(SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, bool bHidden);
SC_DLLPUBLIC SCROW FirstVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
SC_DLLPUBLIC SCROW LastVisibleRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
SCROW CountVisibleRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
- bool RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const;
+ bool RowFiltered(SCROW nRow, SCTAB nTab, SCROW* pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
bool HasFilteredRows(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
- bool ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL) const;
+ bool ColFiltered(SCCOL nCol, SCTAB nTab, SCCOL* pFirstCol = nullptr, SCCOL* pLastCol = nullptr) const;
SC_DLLPUBLIC void SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bFiltered);
SCROW FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
SCROW LastNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const;
@@ -1678,11 +1678,11 @@ public:
void SetPageSize( SCTAB nTab, const Size& rSize );
void SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow );
void InvalidatePageBreaks(SCTAB nTab);
- void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = NULL );
+ void UpdatePageBreaks( SCTAB nTab, const ScRange* pUserArea = nullptr );
void RemoveManualBreaks( SCTAB nTab );
bool HasManualBreaks( SCTAB nTab ) const;
- bool IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab = NULL );
+ bool IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab = nullptr );
bool RemovePageStyleInUse( const OUString& rStrPageStyle );
bool RenamePageStyleInUse( const OUString& rOld, const OUString& rNew );
void ModifyStyleSheet( SfxStyleSheetBase& rPageStyle,
@@ -1729,7 +1729,7 @@ public:
void FillInfo(
ScTableInfo& rTabInfo, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCTAB nTab, double fColScale, double fRowScale, bool bPageMode, bool bFormulaMode,
- const ScMarkData* pMarkData = NULL );
+ const ScMarkData* pMarkData = nullptr );
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
SC_DLLPUBLIC SvNumberFormatter* CreateFormatTable() const;
@@ -2224,10 +2224,10 @@ private:
void SharePooledResources( ScDocument* pSrcDoc );
void EndListeningIntersectedGroup(
- sc::EndListeningContext& rCxt, const ScAddress& rPos, std::vector<ScAddress>* pGroupPos = NULL );
+ sc::EndListeningContext& rCxt, const ScAddress& rPos, std::vector<ScAddress>* pGroupPos = nullptr );
void EndListeningIntersectedGroups(
- sc::EndListeningContext& rCxt, const ScRange& rRange, std::vector<ScAddress>* pGroupPos = NULL );
+ sc::EndListeningContext& rCxt, const ScRange& rRange, std::vector<ScAddress>* pGroupPos = nullptr );
void EndListeningGroups( const std::vector<ScAddress>& rPosArray );
void SetNeedsListeningGroups( const std::vector<ScAddress>& rPosArray );
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index e7fc0b63a829..5567260c47b4 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -82,7 +82,7 @@ public:
void setOriginDate(sal_uInt16 nYear, sal_uInt16 nMonth, sal_uInt16 nDay);
void setAutoInput(const ScAddress& rPos, const OUString& rStr,
- ScSetStringParam* pStringParam = NULL);
+ ScSetStringParam* pStringParam = nullptr);
void setNumericCell(const ScAddress& rPos, double fVal);
void setStringCell(const ScAddress& rPos, const OUString& rStr);
void setEditCell(const ScAddress& rPos, EditTextObject* pEditText);
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 6ed9a5167e15..546625d69918 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -115,7 +115,7 @@ public:
/** Check whether a specified row is active or not. When a row is active,
it is used in calculation of the results data. A row becomes inactive
when it is filtered out by page field. */
- bool isRowActive(sal_Int32 nRow, sal_Int32* pLastRow = NULL) const;
+ bool isRowActive(sal_Int32 nRow, sal_Int32* pLastRow = nullptr) const;
/** Set filter on/off flag to each row to control visibility. The caller
must ensure that the table is filled before calling this function. */
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index db2a6897e795..9cb613574b07 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -155,8 +155,8 @@ public:
css::uno::Reference<css::sheet::XDimensionsSupplier> GetSource();
bool IsSheetData() const;
- bool IsImportData() const { return(pImpDesc != NULL); }
- bool IsServiceData() const { return(pServDesc != NULL); }
+ bool IsImportData() const { return(pImpDesc != nullptr); }
+ bool IsServiceData() const { return(pServDesc != nullptr); }
void SetName(const OUString& rNew);
const OUString& GetName() const { return aTableName; }
@@ -171,7 +171,7 @@ public:
bool IsDataDescriptionCell(const ScAddress& rPos);
bool IsDimNameInUse(const OUString& rName) const;
- OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = NULL );
+ OUString GetDimName( long nDim, bool& rIsDataLayout, sal_Int32* pFlags = nullptr );
bool IsDuplicated( long nDim );
long GetDimCount();
void GetHeaderPositionData(const ScAddress& rPos, css::sheet::DataPilotTableHeaderData& rData);
@@ -246,9 +246,9 @@ public:
const ScPivotFieldVector& rFields, sal_uInt16 nOrient,
const css::uno::Reference< css::sheet::XDimensionsSupplier>& xSource,
const ScDPLabelDataVector& rLabels,
- const ScPivotFieldVector* pRefColFields = NULL,
- const ScPivotFieldVector* pRefRowFields = NULL,
- const ScPivotFieldVector* pRefPageFields = NULL );
+ const ScPivotFieldVector* pRefColFields = nullptr,
+ const ScPivotFieldVector* pRefRowFields = nullptr,
+ const ScPivotFieldVector* pRefPageFields = nullptr );
static bool IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags );
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 4d7467aa2a16..fb52ffa63326 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -353,7 +353,7 @@ public:
const ScDPDimensionSaveData* GetExistingDimensionData() const
{ return pDimensionData; }
- void RemoveAllGroupDimensions( const OUString& rSrcDimName, std::vector<OUString>* pDeletedNames = NULL );
+ void RemoveAllGroupDimensions( const OUString& rSrcDimName, std::vector<OUString>* pDeletedNames = nullptr );
SC_DLLPUBLIC ScDPDimensionSaveData* GetDimensionData(); // create if not there
void SetDimensionData( const ScDPDimensionSaveData* pNew ); // copied
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index e12b88f33689..d2e0b99fcbc6 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -162,7 +162,7 @@ private:
ScDPAggData* pChild;
public:
- ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(NULL) {}
+ ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(nullptr) {}
~ScDPAggData() { delete pChild; }
void Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState );
@@ -377,7 +377,7 @@ public:
bool HasHiddenDetails() const { return bHasHiddenDetails; }
bool IsSubTotalInTitle(long nMeasure) const;
- long GetSubTotalCount( long* pUserSubStart = NULL ) const;
+ long GetSubTotalCount( long* pUserSubStart = nullptr ) const;
bool IsNamedItem( SCROW nIndex ) const;
bool IsValidEntry( const ::std::vector< SCROW >& aMembers ) const;
@@ -424,7 +424,7 @@ public:
const ScDPLevel* GetParentLevel() const { return aParentDimData.mpParentLevel; } //! Ref
const ScDPMember* GetDPMember()const { return aParentDimData.mpMemberDesc; } //! Ref
SCROW GetOrder() const { return aParentDimData.mnOrder; } //! Ref
- bool IsRoot() const { return GetParentLevel() == NULL; }
+ bool IsRoot() const { return GetParentLevel() == nullptr; }
SCROW GetDataId( ) const ;
ScDPAggData* GetColTotal( long nMeasure ) const;
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 10d7414a34af..2bd6d55d72ed 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -170,7 +170,7 @@ public:
SdrObject* GetNamedObject( const OUString& rName, sal_uInt16 nId, SCTAB& rFoundTab ) const;
// if pnCounter != NULL, the search for a name starts with this index + 1,
// and the index really used is returned.
- OUString GetNewGraphicName( long* pnCounter = NULL ) const;
+ OUString GetNewGraphicName( long* pnCounter = nullptr ) const;
void EnsureGraphicNames();
static bool IsCellAnchored( const SdrObject& rObj );
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 3d58582fea91..cdce6204d6c1 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -181,7 +181,7 @@ public:
ScTabEditEngine( ScDocument* pDoc ); // Default
ScTabEditEngine( const ScPatternAttr& rPattern,
SfxItemPool* pEnginePool,
- SfxItemPool* pTextObjectPool = NULL );
+ SfxItemPool* pTextObjectPool = nullptr );
};
struct ScHeaderFieldData
@@ -208,7 +208,7 @@ private:
public:
ScFieldEditEngine(
- ScDocument* pDoc, SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = NULL,
+ ScDocument* pDoc, SfxItemPool* pEnginePool, SfxItemPool* pTextObjectPool = nullptr,
bool bDeleteEnginePool = false);
void SetExecuteURL(bool bSet) { bExecuteURL = bSet; }
@@ -237,7 +237,7 @@ class ScNoteEditEngine : public ScEditEngineDefaulter
public:
ScNoteEditEngine( SfxItemPool* pEnginePool,
- SfxItemPool* pTextObjectPool = NULL,
+ SfxItemPool* pTextObjectPool = nullptr,
bool bDeleteEnginePool = false );
};
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index d341b797f854..ae4decdda6c2 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -154,7 +154,7 @@ public:
* values, for performance reasons.
*/
SC_DLLPUBLIC void setCell(SCCOL nCol, SCROW nRow, TokenRef pToken, sal_uLong nFmtIndex = 0, bool bSetCacheRange = true);
- SC_DLLPUBLIC TokenRef getCell(SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex = NULL) const;
+ SC_DLLPUBLIC TokenRef getCell(SCCOL nCol, SCROW nRow, sal_uInt32* pnFmtIndex = nullptr) const;
bool hasRow( SCROW nRow ) const;
/** Set/clear referenced status flag only if current status is not
REFERENCED_PERMANENT. */
@@ -473,7 +473,7 @@ public:
*
* @return shared_ptr to the cache table instance
*/
- ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const OUString& rTabName, bool bCreateNew, size_t* pnIndex = 0);
+ ScExternalRefCache::TableTypeRef getCacheTable(sal_uInt16 nFileId, const OUString& rTabName, bool bCreateNew, size_t* pnIndex = nullptr);
/** Returns a vector containing all (real) table names and cache tables of
the specified file.
@@ -537,7 +537,7 @@ public:
ScExternalRefCache::TokenRef getSingleRefToken(
sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rCell,
- const ScAddress* pCurPos, SCTAB* pTab, ScExternalRefCache::CellFormat* pFmt = NULL);
+ const ScAddress* pCurPos, SCTAB* pTab, ScExternalRefCache::CellFormat* pFmt = nullptr);
/**
* Get an array of tokens that consist of the specified external cell
@@ -567,7 +567,7 @@ public:
* @return shared_ptr to array of tokens composing the name
*/
ScExternalRefCache::TokenArrayRef getRangeNameTokens(
- sal_uInt16 nFileId, const OUString& rName, const ScAddress* pCurPos = NULL);
+ sal_uInt16 nFileId, const OUString& rName, const ScAddress* pCurPos = nullptr);
bool isValidRangeName(sal_uInt16 nFileId, const OUString& rName);
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 987daf39e425..9de700bf76e0 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -76,7 +76,7 @@ class ScEEAbsImport {
virtual ScRange GetRange() = 0;
virtual void WriteToDocument(
bool bSizeColsRows = false, double nOutputFactor = 1.0,
- SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
+ SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) = 0;
};
class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
@@ -94,7 +94,7 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin {
const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) = 0;
virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0,
- bool bCalcWidthHeight = true, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) = 0;
+ bool bCalcWidthHeight = true, SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) = 0;
// various import helpers
virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) = 0;
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 3171af631898..5f1c43a0fd95 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -244,7 +244,7 @@ public:
bool HasRelNameReference() const;
bool UpdateReference(
- const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = NULL, const ScAddress* pUndoCellPos = NULL );
+ const sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr, const ScAddress* pUndoCellPos = nullptr );
/**
* Shift the position of formula cell as part of reference update.
@@ -394,7 +394,7 @@ public:
void StartListeningTo( ScDocument* pDoc );
void StartListeningTo( sc::StartListeningContext& rCxt );
void EndListeningTo(
- ScDocument* pDoc, ScTokenArray* pArr = NULL, ScAddress aPos = ScAddress() );
+ ScDocument* pDoc, ScTokenArray* pArr = nullptr, ScAddress aPos = ScAddress() );
void EndListeningTo( sc::EndListeningContext& rCxt );
bool IsShared() const;
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index f06968780644..6cd50464a313 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -92,7 +92,7 @@ public:
virtual ~ScTpFormulaItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const ScFormulaOptions& GetFormulaOptions() const { return theOptions; }
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 3a47f55e3228..7f74550281bd 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -530,7 +530,7 @@ public:
SC_DLLPUBLIC static const OUString& GetRscString( sal_uInt16 nIndex );
/// Open the specified URL.
/// If pDrawLayer is specified, check if tiled-rendering, and leave clients to handle the openURL action if that's the case.
- static void OpenURL(const OUString& rURL, const OUString& rTarget, const SdrModel* pDrawLayer = NULL);
+ static void OpenURL(const OUString& rURL, const OUString& rTarget, const SdrModel* pDrawLayer = nullptr);
SC_DLLPUBLIC static OUString GetAbsDocName( const OUString& rFileName,
SfxObjectShell* pShell );
SC_DLLPUBLIC static OUString GetDocTabName( const OUString& rFileName,
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index 0aa7eb204473..0ecbd8b2b50b 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -45,8 +45,8 @@ class EndListeningContext : boost::noncopyable
ScAddress maPosDelta; // Add this to get the old position prior to the move.
public:
- EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCode = NULL);
- EndListeningContext(ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode = NULL);
+ EndListeningContext(ScDocument& rDoc, ScTokenArray* pOldCode = nullptr);
+ EndListeningContext(ScDocument& rDoc, const std::shared_ptr<ColumnBlockPositionSet>& pSet, ScTokenArray* pOldCode = nullptr);
void setPositionDelta( const ScAddress& rDelta );
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 49a164627a72..0bc516223968 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -71,10 +71,10 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS(CellTextAttr, element_type_celltextattr, CellT
}
/// These need to be in global namespace just like their respective types are.
-MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(ScPostIt, sc::element_type_cellnote, NULL, sc::cellnote_block)
-MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(SvtBroadcaster, sc::element_type_broadcaster, NULL, sc::broadcaster_block)
-MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(ScFormulaCell, sc::element_type_formula, NULL, sc::formula_block)
-MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(EditTextObject, sc::element_type_edittext, NULL, sc::edittext_block)
+MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(ScPostIt, sc::element_type_cellnote, nullptr, sc::cellnote_block)
+MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(SvtBroadcaster, sc::element_type_broadcaster, nullptr, sc::broadcaster_block)
+MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(ScFormulaCell, sc::element_type_formula, nullptr, sc::formula_block)
+MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(EditTextObject, sc::element_type_edittext, nullptr, sc::edittext_block)
namespace svl {
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index ee30a0da0612..4080e76fab2b 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -54,13 +54,13 @@ class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem
ScStyleSheet* pStyle;
public:
ScPatternAttr(SfxItemSet* pItemSet, const OUString& rStyleName);
- ScPatternAttr(SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet = NULL);
+ ScPatternAttr(SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet = nullptr);
ScPatternAttr(SfxItemPool* pItemPool);
ScPatternAttr(const ScPatternAttr& rPatternAttr);
virtual ~ScPatternAttr();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const override;
virtual SvStream& Store(SvStream& rStream, sal_uInt16 nItemVersion) const override;
@@ -78,31 +78,31 @@ public:
void DeleteUnchanged( const ScPatternAttr* pOldAttrs );
- static SvxCellOrientation GetCellOrientation( const SfxItemSet& rItemSet, const SfxItemSet* pCondSet = 0 );
- SvxCellOrientation GetCellOrientation( const SfxItemSet* pCondSet = 0 ) const;
+ static SvxCellOrientation GetCellOrientation( const SfxItemSet& rItemSet, const SfxItemSet* pCondSet = nullptr );
+ SvxCellOrientation GetCellOrientation( const SfxItemSet* pCondSet = nullptr ) const;
/** Static helper function to fill a font object from the passed item set. */
static void GetFont( vcl::Font& rFont, const SfxItemSet& rItemSet,
ScAutoFontColorMode eAutoMode,
- OutputDevice* pOutDev = NULL,
- const Fraction* pScale = NULL,
- const SfxItemSet* pCondSet = NULL,
- SvtScriptType nScript = SvtScriptType::NONE, const Color* pBackConfigColor = NULL,
- const Color* pTextConfigColor = NULL );
+ OutputDevice* pOutDev = nullptr,
+ const Fraction* pScale = nullptr,
+ const SfxItemSet* pCondSet = nullptr,
+ SvtScriptType nScript = SvtScriptType::NONE, const Color* pBackConfigColor = nullptr,
+ const Color* pTextConfigColor = nullptr );
static ScDxfFont GetDxfFont(const SfxItemSet& rSet, SvtScriptType nScript);
/** Fills a font object from the own item set. */
void GetFont( vcl::Font& rFont, ScAutoFontColorMode eAutoMode,
- OutputDevice* pOutDev = NULL,
- const Fraction* pScale = NULL,
- const SfxItemSet* pCondSet = NULL,
- SvtScriptType nScript = SvtScriptType::NONE, const Color* pBackConfigColor = NULL,
- const Color* pTextConfigColor = NULL ) const;
+ OutputDevice* pOutDev = nullptr,
+ const Fraction* pScale = nullptr,
+ const SfxItemSet* pCondSet = nullptr,
+ SvtScriptType nScript = SvtScriptType::NONE, const Color* pBackConfigColor = nullptr,
+ const Color* pTextConfigColor = nullptr ) const;
/** Converts all Calc items contained in rSrcSet to edit engine items and puts them into rEditSet. */
- static void FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& rSrcSet, const SfxItemSet* pCondSet = NULL );
+ static void FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& rSrcSet, const SfxItemSet* pCondSet = nullptr );
/** Converts all Calc items contained in the own item set to edit engine items and puts them into pEditSet. */
- void FillEditItemSet( SfxItemSet* pEditSet, const SfxItemSet* pCondSet = NULL ) const;
+ void FillEditItemSet( SfxItemSet* pEditSet, const SfxItemSet* pCondSet = nullptr ) const;
/** Converts all edit engine items contained in rEditSet to Calc items and puts them into rDestSet. */
static void GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& rEditSet );
@@ -149,7 +149,7 @@ class ScFontToSubsFontConverter_AutoPtr
public:
ScFontToSubsFontConverter_AutoPtr()
- : h(0)
+ : h(nullptr)
{}
~ScFontToSubsFontConverter_AutoPtr()
{
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 8640e480e33b..5b111c404217 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -148,7 +148,7 @@ private:
/** Creates the caption object from initial caption data if existing. */
void CreateCaptionFromInitData( const ScAddress& rPos ) const;
/** Creates a new caption object at the passed cell position, clones passed existing caption. */
- void CreateCaption( const ScAddress& rPos, const SdrCaptionObj* pCaption = 0 );
+ void CreateCaption( const ScAddress& rPos, const SdrCaptionObj* pCaption = nullptr );
/** Removes the caption object from the drawing layer, if this note is its owner. */
void RemoveCaption();
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 8ab7e8e30f9e..0cc93968cdf5 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -62,7 +62,7 @@ public:
virtual ~ScTpPrintItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const ScPrintOptions& GetPrintOptions() const { return theOptions; }
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 062e618a5ce2..9eae5b95e80f 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -38,12 +38,12 @@ public:
ScRangeList& operator=(const ScRangeList& rList);
void Append( const ScRange& rRange );
- sal_uInt16 Parse( const OUString&, ScDocument* = NULL,
+ sal_uInt16 Parse( const OUString&, ScDocument* = nullptr,
sal_uInt16 nMask = SCA_VALID,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
SCTAB nDefaultTab = 0, sal_Unicode cDelimiter = 0 );
- void Format( OUString&, sal_uInt16 nFlags = 0, ScDocument* = NULL,
+ void Format( OUString&, sal_uInt16 nFlags = 0, ScDocument* = nullptr,
formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_OOO,
sal_Unicode cDelimiter = 0 ) const;
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 426329a1818f..4db3e39d320a 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -94,7 +94,7 @@ public:
const OUString& rName,
const ScAddress& rTarget );
// rTarget is ABSPOS jump label
- ScRangeData(const ScRangeData& rScRangeData, ScDocument* pDocument = NULL);
+ ScRangeData(const ScRangeData& rScRangeData, ScDocument* pDocument = nullptr);
SC_DLLPUBLIC ~ScRangeData();
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index c30880816609..fb129017b5a8 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -55,24 +55,24 @@ public:
static bool IsAbsTabArea ( const OUString& rAreaStr,
ScDocument* pDoc,
- ScArea*** pppAreas = 0,
- sal_uInt16* pAreaCount = 0,
+ ScArea*** pppAreas = nullptr,
+ sal_uInt16* pAreaCount = nullptr,
bool bAcceptCellRef = false,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 );
static bool IsAbsArea ( const OUString& rAreaStr,
ScDocument* pDoc,
SCTAB nTab,
- OUString* pCompleteStr = 0,
- ScRefAddress* pStartPos = 0,
- ScRefAddress* pEndPos = 0,
+ OUString* pCompleteStr = nullptr,
+ ScRefAddress* pStartPos = nullptr,
+ ScRefAddress* pEndPos = nullptr,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 );
static bool IsAbsPos ( const OUString& rPosStr,
ScDocument* pDoc,
SCTAB nTab,
- OUString* pCompleteStr = 0,
- ScRefAddress* pPosTripel = 0,
+ OUString* pCompleteStr = nullptr,
+ ScRefAddress* pPosTripel = nullptr,
ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 );
static bool MakeRangeFromName( const OUString& rName,
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index 1123a670dfb0..2cc64dac4db7 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -36,7 +36,7 @@ class ScRefFinder
public:
ScRefFinder(
- const OUString& rFormula, const ScAddress& rPos, ScDocument* pDoc = NULL,
+ const OUString& rFormula, const ScAddress& rPos, ScDocument* pDoc = nullptr,
formula::FormulaGrammar::AddressConvention eConvP = formula::FormulaGrammar::CONV_OOO );
~ScRefFinder();
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index c2373aada6f4..5aafb1de18e7 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -175,11 +175,11 @@ class AbstractScInsertTableDlg : public VclAbstractDialog
public:
virtual bool GetTablesFromFile() = 0;
virtual bool GetTablesAsLink() = 0;
- virtual const OUString* GetFirstTable( sal_uInt16* pN = NULL ) = 0;
+ virtual const OUString* GetFirstTable( sal_uInt16* pN = nullptr ) = 0;
virtual ScDocShell* GetDocShellTables() = 0;
virtual bool IsTableBefore() = 0;
virtual sal_uInt16 GetTableCount() = 0;
- virtual const OUString* GetNextTable( sal_uInt16* pN = NULL ) = 0;
+ virtual const OUString* GetNextTable( sal_uInt16* pN = nullptr ) = 0;
};
@@ -382,7 +382,7 @@ public:
virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( vcl::Window* pParent,
InsertDeleteFlags nCheckDefaults = InsertDeleteFlags::NONE,
- const OUString* pStrTitle = NULL ) = 0;
+ const OUString* pStrTitle = nullptr ) = 0;
virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(vcl::Window* pParent, ScViewData& rViewData,
SCTAB nTabCount, bool bFromFile) = 0;
@@ -457,8 +457,8 @@ public:
virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( vcl::Window* pParent,
bool bAscii = true,
- const ScImportOptions* pOptions = NULL,
- const OUString* pStrTitle = NULL,
+ const ScImportOptions* pOptions = nullptr,
+ const OUString* pStrTitle = nullptr,
bool bMultiByte = false,
bool bOnlyDbtoolsEncodings = false,
bool bImport = true ) = 0;
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index ed3bd59058c3..c6513815fa44 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -377,7 +377,7 @@ public:
double GetMinValue( bool bTextAsZero ) const;
ScMatrixRef CompareMatrix(
- sc::Compare& rComp, size_t nMatPos, sc::CompareOptions* pOptions = NULL ) const;
+ sc::Compare& rComp, size_t nMatPos, sc::CompareOptions* pOptions = nullptr ) const;
/**
* Convert the content of matrix into a linear array of numeric values.
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index c54a28d72723..ec935631a256 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -203,13 +203,13 @@ public:
// InputHandler:
bool IsEditMode(); // not for SC_INPUT_TYPE
bool IsInputMode(); // also for SC_INPUT_TYPE
- void SetInputMode( ScInputMode eMode, const OUString* pInitText = NULL );
+ void SetInputMode( ScInputMode eMode, const OUString* pInitText = nullptr );
bool InputKeyEvent( const KeyEvent& rKEvt, bool bStartEdit = false );
SC_DLLPUBLIC void InputEnterHandler( ScEnterMode nBlockMode = ScEnterMode::NORMAL );
void InputCancelHandler();
void InputSelection( EditView* pView );
void InputChanged( EditView* pView );
- ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = NULL, bool bUseRef = true );
+ ScInputHandler* GetInputHdl( ScTabViewShell* pViewSh = nullptr, bool bUseRef = true );
void SetRefInputHdl( ScInputHandler* pNew );
ScInputHandler* GetRefInputHdl() { return pRefInputHandler;}
@@ -222,7 +222,7 @@ public:
void InputReplaceSelection( const OUString& rStr );
void InputTurnOffWinEngine();
OUString InputGetFormulaStr();
- void ActivateInputWindow( const OUString* pStr = NULL,
+ void ActivateInputWindow( const OUString* pStr = nullptr,
bool bMatrix = false );
void InitFormEditData();
@@ -230,13 +230,13 @@ public:
ScFormEditData* GetFormEditData() { return pFormEditData; }
// input of reference:
- SC_DLLPUBLIC void SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm = NULL );
- bool IsModalMode(SfxObjectShell* pDocSh = NULL);
+ SC_DLLPUBLIC void SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm = nullptr );
+ bool IsModalMode(SfxObjectShell* pDocSh = nullptr);
bool IsFormulaMode();
bool IsRefDialogOpen();
bool IsTableLocked();
void SetReference( const ScRange& rRef, ScDocument* pDoc,
- const ScMarkData* pMarkData = NULL );
+ const ScMarkData* pMarkData = nullptr );
void AddRefEntry();
void EndReference();
sal_uInt16 GetCurRefDlgId() const { return nCurRefDlgId; }
diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx
index 33a2d48dcef6..b3d761585a35 100644
--- a/sc/inc/sharedformula.hxx
+++ b/sc/inc/sharedformula.hxx
@@ -34,7 +34,7 @@ public:
{
_Iter it = itBeg;
ScFormulaCell* pPrev = *it;
- ScFormulaCell* pCur = NULL;
+ ScFormulaCell* pCur = nullptr;
for (++it; it != itEnd; ++it, pPrev = pCur)
{
pCur = *it;
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index b76632e611a9..a53269853f04 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -237,7 +237,7 @@ public:
virtual ~ScStyleObj();
// created by getImplementation:
- bool IsInserted() const { return pDocShell != NULL; }
+ bool IsInserted() const { return pDocShell != nullptr; }
SfxStyleFamily GetFamily() const { return eFamily; }
void InitDoc( ScDocShell* pNewDocSh, const OUString& rNewName );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 3ae472becd9c..da2876f5a366 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -320,9 +320,9 @@ public:
void UnlockTable();
bool IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
- SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = nullptr ) const;
bool IsSelectionEditable( const ScMarkData& rMark,
- bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool* pOnlyNotBecauseOfMatrix = nullptr ) const;
bool HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
bool HasSelectionMatrixFragment( const ScMarkData& rMark ) const;
@@ -330,7 +330,7 @@ public:
bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const;
bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString,
- ScSetStringParam* pParam = NULL );
+ ScSetStringParam* pParam = nullptr );
bool SetEditText( SCCOL nCol, SCROW nRow, EditTextObject* pEditText );
void SetEditText( SCCOL nCol, SCROW nRow, const EditTextObject& rEditText, const SfxItemPool* pEditPool );
@@ -401,17 +401,17 @@ public:
void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize );
void DeleteRow(
const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize,
- bool* pUndoOutline = NULL, std::vector<ScAddress>* pGroupPos = NULL );
+ bool* pUndoOutline = nullptr, std::vector<ScAddress>* pGroupPos = nullptr );
bool TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) const;
void InsertCol(
const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
void DeleteCol(
- const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, bool* pUndoOutline = NULL );
+ const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize, bool* pUndoOutline = nullptr );
void DeleteArea(
SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, InsertDeleteFlags nDelFlag,
- bool bBroadcast = true, sc::ColumnSpanSet* pBroadcastSpans = NULL );
+ bool bBroadcast = true, sc::ColumnSpanSet* pBroadcastSpans = nullptr );
void CopyToClip( sc::CopyToClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable );
void CopyToClip( sc::CopyToClipContext& rCxt, const ScRangeList& rRanges, ScTable* pTable );
@@ -444,11 +444,11 @@ public:
void CopyToTable(
sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab,
- const ScMarkData* pMarkData = NULL, bool bAsLink = false, bool bColRowFlags = true );
+ const ScMarkData* pMarkData = nullptr, bool bAsLink = false, bool bColRowFlags = true );
void UndoToTable(
sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = NULL );
+ InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData = nullptr );
void CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCsCOL nDx, SCsROW nDy, ScTable* pTable);
@@ -546,7 +546,7 @@ public:
bool CompileErrorCells( sc::CompileFormulaContext& rCxt, sal_uInt16 nErrCode );
void UpdateReference(
- sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = NULL,
+ sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc = nullptr,
bool bIncludeDraw = true, bool bUpdateNoteCaptionPos = true );
void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
@@ -613,7 +613,7 @@ public:
void ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr );
void ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
void ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
- const ScPatternAttr& rAttr, ScEditDataArray* pDataArray = NULL );
+ const ScPatternAttr& rAttr, ScEditDataArray* pDataArray = nullptr );
void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, bool bPutToPool = false )
{
@@ -647,7 +647,7 @@ public:
bool ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
bool RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
- void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = NULL );
+ void ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray = nullptr );
void DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast = true );
void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
@@ -680,11 +680,11 @@ public:
const ScColWidthParam* pParam );
bool SetOptimalHeight(
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow,
- ScProgress* pOuterProgress = NULL, sal_uLong nProgressStart = 0 );
+ ScProgress* pOuterProgress = nullptr, sal_uLong nProgressStart = 0 );
void SetOptimalHeightOnly(
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow,
- ScProgress* pOuterProgress = NULL, sal_uLong nProgressStart = 0 );
+ ScProgress* pOuterProgress = nullptr, sal_uLong nProgressStart = 0 );
long GetNeededSize( SCCOL nCol, SCROW nRow,
OutputDevice* pDev,
@@ -711,7 +711,7 @@ public:
sal_uInt16 GetColWidth( SCCOL nCol, bool bHiddenAsZero = true ) const;
sal_uLong GetColWidth( SCCOL nStartCol, SCCOL nEndCol, bool bHiddenAsZero = true ) const;
- SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const;
+ SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow = nullptr, SCROW* pEndRow = nullptr, bool bHiddenAsZero = true ) const;
sal_uLong GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero = true ) const;
sal_uLong GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const;
sal_uLong GetColOffset( SCCOL nCol, bool bHiddenAsZero = true ) const;
@@ -796,10 +796,10 @@ public:
css::uno::Sequence<
css::sheet::TablePageBreakData> GetRowBreakData() const;
- bool RowHidden(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const;
- bool RowHiddenLeaf(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const;
+ bool RowHidden(SCROW nRow, SCROW* pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
+ bool RowHiddenLeaf(SCROW nRow, SCROW* pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
bool HasHiddenRows(SCROW nStartRow, SCROW nEndRow) const;
- bool ColHidden(SCCOL nCol, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL) const;
+ bool ColHidden(SCCOL nCol, SCCOL* pFirstCol = nullptr, SCCOL* pLastCol = nullptr) const;
bool SetRowHidden(SCROW nStartRow, SCROW nEndRow, bool bHidden);
bool SetColHidden(SCCOL nStartCol, SCCOL nEndCol, bool bHidden);
void CopyColHidden(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol);
@@ -812,8 +812,8 @@ public:
SCCOLROW LastHiddenColRow(SCCOLROW nPos, bool bCol) const;
- bool RowFiltered(SCROW nRow, SCROW* pFirstRow = NULL, SCROW* pLastRow = NULL) const;
- bool ColFiltered(SCCOL nCol, SCCOL* pFirstCol = NULL, SCCOL* pLastCol = NULL) const;
+ bool RowFiltered(SCROW nRow, SCROW* pFirstRow = nullptr, SCROW* pLastRow = nullptr) const;
+ bool ColFiltered(SCCOL nCol, SCCOL* pFirstCol = nullptr, SCCOL* pLastCol = nullptr) const;
bool HasFilteredRows(SCROW nStartRow, SCROW nEndRow) const;
void CopyColFiltered(ScTable& rTable, SCCOL nStartCol, SCCOL nEndCol);
void CopyRowFiltered(ScTable& rTable, SCROW nStartRow, SCROW nEndRow);
@@ -840,8 +840,8 @@ public:
void Reorder( const sc::ReorderParam& rParam, ScProgress* pProgress );
bool ValidQuery(
- SCROW nRow, const ScQueryParam& rQueryParam, ScRefCellValue* pCell = NULL,
- bool* pbTestEqualCondition = NULL);
+ SCROW nRow, const ScQueryParam& rQueryParam, ScRefCellValue* pCell = nullptr,
+ bool* pbTestEqualCondition = nullptr);
void TopTenQuery( ScQueryParam& );
SCSIZE Query(ScQueryParam& rQueryParam, bool bKeepSub);
bool CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
@@ -1115,11 +1115,11 @@ private:
const ScColumn* FetchColumn( SCCOL nCol ) const;
void EndListeningIntersectedGroup(
- sc::EndListeningContext& rCxt, SCCOL nCol, SCROW nRow, std::vector<ScAddress>* pGroupPos = NULL );
+ sc::EndListeningContext& rCxt, SCCOL nCol, SCROW nRow, std::vector<ScAddress>* pGroupPos = nullptr );
void EndListeningIntersectedGroups(
sc::EndListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- std::vector<ScAddress>* pGroupPos = NULL );
+ std::vector<ScAddress>* pGroupPos = nullptr );
void EndListeningGroup( sc::EndListeningContext& rCxt, SCCOL nCol, SCROW nRow );
void SetNeedsListeningGroup( SCCOL nCol, SCROW nRow );
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 9cf02bf36671..63c5ec77398b 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -431,7 +431,7 @@ public:
}
else
{
- pS = 0;
+ pS = nullptr;
pD = rT.GetDoubleRef();
// aDub intentionally not initialized, unnecessary
// because unused.
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index 91617f7baf6f..c4398c3e0cfb 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -92,7 +92,7 @@ public:
ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; }
void SetGridColor( const Color& rCol, const OUString& rName ) { aGridCol = rCol; aGridColName = rName;}
- Color GetGridColor( OUString* pStrName = NULL ) const;
+ Color GetGridColor( OUString* pStrName = nullptr ) const;
const ScGridOptions& GetGridOptions() const { return aGridOpt; }
void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; }
@@ -121,7 +121,7 @@ public:
virtual ~ScTpViewItem();
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
const ScViewOptions& GetViewOptions() const { return theOptions; }
--
cgit