summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-10 10:25:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-10 10:31:53 +0100
commit01b49802c7cda7fd4d5ba71263cef7bc95234b89 (patch)
treeb8d92f1c6abf5ac548d0bcb0c581ebfcffd8bfac /sw/source/uibase/inc
parent6cd7bf2043146a630925a2e49336f02c802f707a (diff)
loplugin:nullptr (automatic rewrite)
Change-Id: I01e11fa956a249974e77dce9deebe79311f098d0
Diffstat (limited to 'sw/source/uibase/inc')
-rw-r--r--sw/source/uibase/inc/PageBreakWin.hxx2
-rw-r--r--sw/source/uibase/inc/caption.hxx2
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx10
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx2
-rw-r--r--sw/source/uibase/inc/colex.hxx4
-rw-r--r--sw/source/uibase/inc/content.hxx8
-rw-r--r--sw/source/uibase/inc/conttree.hxx2
-rw-r--r--sw/source/uibase/inc/convert.hxx4
-rw-r--r--sw/source/uibase/inc/dbtree.hxx2
-rw-r--r--sw/source/uibase/inc/edtwin.hxx2
-rw-r--r--sw/source/uibase/inc/envimg.hxx2
-rw-r--r--sw/source/uibase/inc/envlop.hxx2
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx20
-rw-r--r--sw/source/uibase/inc/frmdlg.hxx2
-rw-r--r--sw/source/uibase/inc/gloshdl.hxx8
-rw-r--r--sw/source/uibase/inc/instable.hxx4
-rw-r--r--sw/source/uibase/inc/labimg.hxx2
-rw-r--r--sw/source/uibase/inc/linenum.hxx2
-rw-r--r--sw/source/uibase/inc/mailmergehelper.hxx6
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx2
-rw-r--r--sw/source/uibase/inc/numpara.hxx2
-rw-r--r--sw/source/uibase/inc/numprevw.hxx4
-rw-r--r--sw/source/uibase/inc/optload.hxx2
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx2
-rw-r--r--sw/source/uibase/inc/pggrid.hxx2
-rw-r--r--sw/source/uibase/inc/pview.hxx4
-rw-r--r--sw/source/uibase/inc/regionsw.hxx2
-rw-r--r--sw/source/uibase/inc/srcedtw.hxx2
-rw-r--r--sw/source/uibase/inc/swdtflvr.hxx12
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx6
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx2
-rw-r--r--sw/source/uibase/inc/swuipardlg.hxx2
-rw-r--r--sw/source/uibase/inc/swwrtshitem.hxx2
-rw-r--r--sw/source/uibase/inc/tablemgr.hxx4
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx2
-rw-r--r--sw/source/uibase/inc/tmpdlg.hxx2
-rw-r--r--sw/source/uibase/inc/toxmgr.hxx22
-rw-r--r--sw/source/uibase/inc/uiitems.hxx16
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx4
-rw-r--r--sw/source/uibase/inc/unoatxt.hxx2
-rw-r--r--sw/source/uibase/inc/unomod.hxx2
-rw-r--r--sw/source/uibase/inc/unotools.hxx4
-rw-r--r--sw/source/uibase/inc/unotxvw.hxx2
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx60
44 files changed, 126 insertions, 126 deletions
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index 23a3a134a0c7..2302966cb991 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -42,7 +42,7 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void Activate( ) override;
- void UpdatePosition( const Point* pEvtPt = NULL );
+ void UpdatePosition( const Point* pEvtPt = nullptr );
virtual void ShowAll( bool bShow ) override;
virtual bool Contains( const Point &rDocPt ) const override;
diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index 9fcb72bc816e..446114af66eb 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.hxx
@@ -43,7 +43,7 @@ private:
bool bCopyAttributes; // -""-
public:
- InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = 0);
+ InsCaptionOpt(const SwCapObjType eType = FRAME_CAP, const SvGlobalName* pOleId = nullptr);
InsCaptionOpt(const InsCaptionOpt&);
~InsCaptionOpt();
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index e6c9793501c7..e21869810765 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -64,7 +64,7 @@ public:
SwDocDisplayItem( const SwViewOption& rVOpt,
sal_uInt16 nWhich );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void operator=( const SwDocDisplayItem& );
void FillViewOptions( SwViewOption& rVOpt) const;
@@ -95,7 +95,7 @@ public:
SwElemItem(const SwElemItem& rElemItem);
SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void operator=( const SwElemItem& );
@@ -117,7 +117,7 @@ public:
SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData );
SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -135,7 +135,7 @@ public:
SwShadowCursorItem( const SwShadowCursorItem& rElemItem );
SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void operator=( const SwShadowCursorItem& );
@@ -173,7 +173,7 @@ public:
SfxPoolItem(_nWhich){};
SwTestItem( const SwTestItem& pTestItem);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
};
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index 4de3e0a4e913..cc6199355338 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -50,7 +50,7 @@ class SwCharDlg: public SfxTabDialog
public:
SwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode, const OUString* pFormatStr = 0);
+ sal_uInt8 nDialogMode, const OUString* pFormatStr = nullptr);
virtual ~SwCharDlg();
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index 3e5f122ec2fa..76c5ee383af5 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -56,7 +56,7 @@ protected:
public:
SwPageGridExample(vcl::Window* pPar)
: SwPageExample(pPar)
- , pGridItem(0)
+ , pGridItem(nullptr)
{}
virtual ~SwPageGridExample();
@@ -79,7 +79,7 @@ protected:
public:
SwColExample(vcl::Window* pPar)
: SwPageExample(pPar)
- , pColMgr(0)
+ , pColMgr(nullptr)
{
}
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 07cd57b3588d..85a20ec1bd77 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -99,7 +99,7 @@ public:
long nYPos )
: SwContent(pCnt, rName, nYPos)
, pField(pFormatField)
- , pRedline(NULL)
+ , pRedline(nullptr)
, mbPostIt(true)
{}
SwPostItContent( const SwContentType* pCnt,
@@ -107,7 +107,7 @@ public:
SwRangeRedline* pRed,
long nYPos )
: SwContent(pCnt, rName, nYPos)
- , pField(NULL)
+ , pField(nullptr)
, pRedline(pRed)
, mbPostIt(false)
{}
@@ -167,8 +167,8 @@ public:
SwContentType(SwWrtShell* pParent, ContentTypeId nType, sal_uInt8 nLevel );
virtual ~SwContentType();
- void Init(bool* pbInvalidateWindow = 0);
- void FillMemberList(bool* pbLevelChanged = NULL);
+ void Init(bool* pbInvalidateWindow = nullptr);
+ void FillMemberList(bool* pbLevelChanged = nullptr);
size_t GetMemberCount() const
{return nMemberCount;};
ContentTypeId GetType() const {return nContentType;}
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index a46ec993d541..010b3475b8f0 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -317,7 +317,7 @@ public:
void TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox);
void InsertRegion( const SwGlblDocContent* pCont,
- const OUString* pFileName = 0 );
+ const OUString* pFileName = nullptr );
void EditContent(const SwGlblDocContent* pCont );
void ShowTree();
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index 8609c30a003f..cc2ae88e4417 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.hxx
@@ -57,8 +57,8 @@ class SwConvertTableDlg: public SfxModalDialog
DECL_LINK_TYPED( AutoFormatHdl, Button*, void );
DECL_LINK_TYPED( BtnHdl, Button*, void );
- DECL_LINK_TYPED( CheckBoxHdl, Button* = 0, void );
- DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = 0, void );
+ DECL_LINK_TYPED( CheckBoxHdl, Button* = nullptr, void );
+ DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void );
public:
SwConvertTableDlg( SwView& rView, bool bToTable );
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 1e6f69adbb63..c2d3b6236fac 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -57,7 +57,7 @@ public:
virtual void dispose() override;
virtual Size GetOptimalSize() const override;
- OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = 0);
+ OUString GetDBName( OUString& rTableName, OUString& rColumnName, sal_Bool* pbIsTable = nullptr);
void Select( const OUString& rDBName, const OUString& rTableName,
const OUString& rColumnName );
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 5e8f7571e06e..56cc43888832 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -156,7 +156,7 @@ friend void PageNumNotify( SwViewShell* pVwSh,
void DropCleanup();
void CleanupDropUserMarker();
SotExchangeDest GetDropDestination( const Point& rPixPnt,
- SdrObject ** ppObj = 0 );
+ SdrObject ** ppObj = nullptr );
//select the object/cursor at the mouse position of the context menu request
bool SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos );
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 66fd1438e9fc..62dc0bcc2d7e 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -62,7 +62,7 @@ public:
virtual bool operator ==(const SfxPoolItem& rItem) const override;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
};
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index b8ab936ce842..ca2e7a1ae400 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -109,7 +109,7 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- virtual sfxpg DeactivatePage(SfxItemSet* pSet = 0) override;
+ virtual sfxpg DeactivatePage(SfxItemSet* pSet = nullptr) override;
void FillItem(SwEnvItem& rItem);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 5beab7aac8cf..a8bdfc427c8e 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -79,7 +79,7 @@ struct SwInsertField_Data
VclPtr<vcl::Window> m_pParent; // parent dialog used for SwWrtShell::StartInputFieldDlg()
SwInsertField_Data(sal_uInt16 nType, sal_uInt16 nSub, const OUString& rPar1, const OUString& rPar2,
- sal_uLong nFormatId, SwWrtShell* pShell = NULL, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
+ sal_uLong nFormatId, SwWrtShell* pShell = nullptr, sal_Unicode cSep = ' ', bool bIsAutoLanguage = true) :
m_nTypeId(nType),
m_nSubType(nSub),
m_sPar1(rPar1),
@@ -88,10 +88,10 @@ struct SwInsertField_Data
m_pSh(pShell),
m_cSeparator(cSep),
m_bIsAutomaticLanguage(bIsAutoLanguage),
- m_pParent(0) {}
+ m_pParent(nullptr) {}
SwInsertField_Data() :
- m_pSh(0),
+ m_pSh(nullptr),
m_cSeparator(' '),
m_bIsAutomaticLanguage(true){}
};
@@ -120,7 +120,7 @@ private:
SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> GetNumberingInfo()const;
public:
- explicit SwFieldMgr(SwWrtShell* pSh = 0);
+ explicit SwFieldMgr(SwWrtShell* pSh = nullptr);
~SwFieldMgr();
void SetWrtShell( SwWrtShell* pShell )
@@ -133,7 +133,7 @@ public:
void UpdateCurField(sal_uLong nFormat,
const OUString& rPar1,
const OUString& rPar2,
- SwField * _pField = 0);
+ SwField * _pField = nullptr);
OUString GetCurFieldPar1() const { return aCurPar1; }
OUString GetCurFieldPar2() const { return aCurPar2; }
@@ -149,9 +149,9 @@ public:
inline OUString GetMacroName() const { return sMacroName; }
// previous and next of the same type
- bool GoNextPrev( bool bNext = true, SwFieldType* pTyp = 0 );
- bool GoNext( SwFieldType* pTyp = 0 ) { return GoNextPrev( true, pTyp ); }
- bool GoPrev( SwFieldType* pTyp = 0 ) { return GoNextPrev( false, pTyp ); }
+ bool GoNextPrev( bool bNext = true, SwFieldType* pTyp = nullptr );
+ bool GoNext( SwFieldType* pTyp = nullptr ) { return GoNextPrev( true, pTyp ); }
+ bool GoPrev( SwFieldType* pTyp = nullptr ) { return GoNextPrev( false, pTyp ); }
bool IsDBNumeric(const OUString& rDBName, const OUString& rTableQryName,
bool bIsTable, const OUString& rFieldName);
@@ -189,13 +189,13 @@ public:
sal_uInt16 GetFormatCount(sal_uInt16 nTypeId, bool bIsText, bool bHtmlMode = false) const;
OUString GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
sal_uInt16 GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const;
- sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = 0L);
+ sal_uLong GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumberFormatter* pFormatter, double* pVal = nullptr);
// turn off evaluation of expression fields for insertation
// of many expressino fields (see labels)
inline void SetEvalExpFields(bool bEval);
- void EvalExpFields(SwWrtShell* pSh = NULL);
+ void EvalExpFields(SwWrtShell* pSh = nullptr);
};
inline void SwFieldMgr::SetEvalExpFields(bool bEval)
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index 8b95826a1b98..387ba8853498 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -56,7 +56,7 @@ public:
const OUString& sResType = OUString("FrameDialog"),
bool bFormat = false,
const OString& sDefPage = OString(),
- const OUString* pFormatStr = 0);
+ const OUString* pFormatStr = nullptr);
virtual ~SwFrmDlg();
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index 1a70091903e2..6d23af7f20e1 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.hxx
@@ -45,7 +45,7 @@ public:
void GlossaryDlg();
size_t GetGroupCnt() const;
- OUString GetGroupName( size_t, OUString* pTitle = 0 );
+ OUString GetGroupName( size_t, OUString* pTitle = nullptr );
bool NewGroup(OUString & rGroupName, const OUString& rTitle);
bool DelGroup(const OUString &);
bool RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle);
@@ -74,13 +74,13 @@ public:
void SetMacros(const OUString& rName,
const SvxMacro* pStart,
const SvxMacro* pEnd,
- SwTextBlocks *pGlossary = 0 );
+ SwTextBlocks *pGlossary = nullptr );
void GetMacros(const OUString& rShortName,
SvxMacro& rStart,
SvxMacro& rEnd,
- SwTextBlocks* pGlossary = 0 );
+ SwTextBlocks* pGlossary = nullptr );
- bool IsReadOnly( const OUString* = 0 ) const;
+ bool IsReadOnly( const OUString* = nullptr ) const;
bool IsOld() const;
bool FindGroupName(OUString& rGroup); // find group without path index
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index a838a89c1122..bd84cdd5103a 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.hxx
@@ -59,8 +59,8 @@ class SwInsTableDlg : public SfxModalDialog
DECL_LINK_TYPED( ModifyRowCol, Edit&, void );
DECL_LINK_TYPED( AutoFormatHdl, Button*, void );
DECL_LINK_TYPED( OKHdl, Button*, void);
- DECL_LINK_TYPED( CheckBoxHdl, Button* = 0, void);
- DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = 0, void);
+ DECL_LINK_TYPED( CheckBoxHdl, Button* = nullptr, void);
+ DECL_LINK_TYPED( ReapeatHeaderCheckBoxHdl, Button* = nullptr, void);
DECL_LINK_TYPED( ModifyRepeatHeaderNF_Hdl, Edit&, void );
public:
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 4207c38b8b8e..4a11b248020c 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -38,7 +38,7 @@ public:
virtual bool operator ==(const SfxPoolItem& rItem) const override;
- virtual SfxPoolItem* Clone(SfxItemPool* = 0) const override;
+ virtual SfxPoolItem* Clone(SfxItemPool* = nullptr) const override;
OUString m_aLstMake; // remember last selection
OUString m_aLstType;
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index 7db3ed8fdb85..f12e8e886794 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.hxx
@@ -49,7 +49,7 @@ private:
VclPtr<CheckBox> m_pNumberingOnCB;
VclPtr<CheckBox> m_pNumberingOnFooterHeader;
DECL_LINK_TYPED(OKHdl, Button*, void);
- DECL_LINK_TYPED(LineOnOffHdl, Button* = 0, void);
+ DECL_LINK_TYPED(LineOnOffHdl, Button* = nullptr, void);
DECL_LINK_TYPED(ModifyHdl, Edit&, void);
public:
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index a1cdbf66f2a9..b8613a78a153 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -50,7 +50,7 @@ namespace SwMailMergeHelper
css::uno::Reference<css::mail::XMailService>& xInMailService,
const OUString& rInMailServerPassword,
const OUString& rOutMailServerPassword,
- vcl::Window* pDialogParentWindow = 0);
+ vcl::Window* pDialogParentWindow = nullptr);
}
struct SwAddressPreview_Impl;
@@ -107,7 +107,7 @@ public:
// fill the actual data into a string (address block or greeting)
static OUString FillData(const OUString& rAddress, SwMailMergeConfigItem& rConfigItem,
- const css::uno::Sequence<OUString>* pAssignments = 0);
+ const css::uno::Sequence<OUString>* pAssignments = nullptr);
void SetSelectHdl (const Link<LinkParamNone*,void>& rLink) { m_aSelectHdl = rLink; }
};
@@ -146,7 +146,7 @@ class SW_DLLPUBLIC SwAuthenticator :
VclPtr<vcl::Window> m_pParentWindow;
public:
SwAuthenticator()
- : m_pParentWindow(0)
+ : m_pParentWindow(nullptr)
{}
SwAuthenticator(const OUString& username, const OUString& password, vcl::Window* pParent)
: m_aUserName(username)
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index b0ab3ba771e0..f4d1aae66ce2 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -120,7 +120,7 @@ public:
const OUString& rTableName,
sal_Int32 nCommandType,
const css::uno::Reference< css::sdbc::XConnection>& xConnection,
- css::uno::Sequence< css::uno::Any >* pSelection = 0);
+ css::uno::Sequence< css::uno::Any >* pSelection = nullptr);
virtual ~SwMailMergeDlg();
virtual void dispose() override;
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 741d6dfcce57..6b794a724d13 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -64,7 +64,7 @@ class SwParagraphNumTabPage : public SfxTabPage
protected:
static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
sal_uInt16 nFamily, sal_uInt16 nMask = 0,
- const sal_uInt16* pModifier = NULL );
+ const sal_uInt16* pModifier = nullptr );
public:
SwParagraphNumTabPage(vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx
index 1fae3ac8ab32..0792b6090c69 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -40,14 +40,14 @@ class NumberingPreview : public vcl::Window
public:
NumberingPreview(vcl::Window* pParent, const ResId& rResId)
: Window(pParent, rResId),
- pActNum(0),nPageWidth(0), pOutlineNames(0),
+ pActNum(nullptr),nPageWidth(0), pOutlineNames(nullptr),
bPosition(false), nActLevel(USHRT_MAX)
{
}
NumberingPreview(vcl::Window* pParent)
: Window(pParent)
- , pActNum(0),nPageWidth(0), pOutlineNames(0),
+ , pActNum(nullptr),nPageWidth(0), pOutlineNames(nullptr),
bPosition(false), nActLevel(USHRT_MAX)
{
}
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index c05902aeb1e4..162357a0133b 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -161,7 +161,7 @@ private:
DECL_LINK_TYPED(SaveEntryHdl, SvTreeListBox*, void);
void DelUserData();
- void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0);
+ void SetOptions(const sal_uLong nPos, const SwCapObjType eType, const SvGlobalName *pOleId = nullptr);
void SaveEntry(SvTreeListEntry* pEntry);
void InvalidatePreview();
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 4ea911d56ef2..fcb35a1a4eb4 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -69,7 +69,7 @@ private:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
};
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index 56ef67b36131..d57c3f2bd5a0 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -95,7 +95,7 @@ public:
virtual void Reset(const SfxItemSet *rSet) override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
};
#endif
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index a59f37f87f23..88af21b6da6a 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -192,7 +192,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
bool mbResetFormDesignMode:1;
bool mbFormDesignModeToReset:1;
- SAL_DLLPRIVATE void Init(const SwViewOption* = 0);
+ SAL_DLLPRIVATE void Init(const SwViewOption* = nullptr);
SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
SAL_DLLPRIVATE int _CreateScrollbar( bool bHori);
@@ -217,7 +217,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell
optional input parameter - pointer to the <SfxRequest> instance, if existing.
*/
SAL_DLLPRIVATE void _ExecPgUpAndPgDown( const bool _bPgUp,
- SfxRequest* _pReq = 0 );
+ SfxRequest* _pReq = nullptr );
protected:
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) override;
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index f615299e7285..fa4453ddc60e 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -126,7 +126,7 @@ class SwEditRegionDlg : public SfxModalDialog
DECL_LINK_TYPED( DlgClosedHdl, sfx2::FileDialogHelper*, void );
DECL_LINK_TYPED( SubRegionEventHdl, VclWindowEvent&, void );
- bool CheckPasswd(CheckBox* pBox = 0);
+ bool CheckPasswd(CheckBox* pBox = nullptr);
public:
SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh );
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index d8d6d34be93a..09a436689275 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -53,7 +53,7 @@ protected:
public:
TextViewOutWin(vcl::Window* pParent, WinBits nBits) :
- Window(pParent, nBits), pTextView(0){}
+ Window(pParent, nBits), pTextView(nullptr){}
void SetTextView( ExtTextView* pView ) {pTextView = pView;}
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index b755b7bc9ef1..4b8b238a7a02 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
static SwTransferable* GetSwTransferable( const TransferableDataHelper& rData );
static void SetSelInShell( SwWrtShell& , bool , const Point* );
static bool _CheckForURLOrLNKFile( TransferableDataHelper& rData,
- OUString& rFileName, OUString* pTitle = 0 );
+ OUString& rFileName, OUString* pTitle = nullptr );
static bool _TestAllowedFormat( const TransferableDataHelper& rData,
SotClipboardFormatId nFormat, SotExchangeDest nDestination );
@@ -150,7 +150,7 @@ public:
SwTransferable( SwWrtShell& );
virtual ~SwTransferable();
- static SotExchangeDest GetSotDestination( const SwWrtShell& rSh, const Point* = 0 );
+ static SotExchangeDest GetSotDestination( const SwWrtShell& rSh, const Point* = nullptr );
// set properties on the document, like PageMargin, VisArea.
// And set real Size
@@ -173,7 +173,7 @@ public:
SwWrtShell& rSh, sal_uInt16 nAction, SotClipboardFormatId nFormat,
SotExchangeDest nDestination, bool bIsPasteFormat,
bool bIsDefault,
- const Point* pDDPos = 0, sal_Int8 nDropAction = 0,
+ const Point* pDDPos = nullptr, sal_Int8 nDropAction = 0,
bool bPasteSelection = false );
static bool IsPasteSpecial( const SwWrtShell& rWrtShell,
@@ -196,12 +196,12 @@ public:
// Interfaces for Selection
/* #96392# Added pCreator to distinguish SwFrameShell from SwWrtShell. */
static void CreateSelection( SwWrtShell & rSh,
- const SwFrameShell * pCreator = NULL );
+ const SwFrameShell * pCreator = nullptr );
static void ClearSelection( SwWrtShell& rSh,
- const SwFrameShell * pCreator = NULL );
+ const SwFrameShell * pCreator = nullptr );
// the related SwView is being closed and the SwTransferable is invalid now
- void Invalidate() {m_pWrtShell = 0;}
+ void Invalidate() {m_pWrtShell = nullptr;}
static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 50847c0889ba..29aabdf5d4f0 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -228,7 +228,7 @@ public:
virtual void Reset( const SfxItemSet* ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
@@ -443,7 +443,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
@@ -491,7 +491,7 @@ public:
virtual void Reset( const SfxItemSet* ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
- virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) override;
+ virtual sfxpg DeactivatePage( SfxItemSet* pSet = nullptr ) override;
static VclPtr<SfxTabPage> Create( vcl::Window* pParent,
const SfxItemSet* rAttrSet);
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 86bc063acd57..90d49fe10485 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -145,7 +145,7 @@ public:
~SwIndexMarkPane();
- void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0);
+ void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = nullptr);
bool IsTOXType(const OUString& rName)
{return LISTBOX_ENTRY_NOTFOUND != m_pTypeDCB->GetEntryPos(rName);}
};
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index 874c090c5f93..4fb29dc5a52c 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -44,7 +44,7 @@ public:
SwView& rVw,
const SfxItemSet&,
sal_uInt8 nDialogMode,
- const OUString *pCollName = 0,
+ const OUString *pCollName = nullptr,
bool bDraw = false,
const OString& sDefPage = OString());
virtual ~SwParaDlg();
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index 99c678764c75..a0474a77c1a2 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -34,7 +34,7 @@ public:
SwWrtShellItem( const SwWrtShellItem& );
virtual bool operator==( const SfxPoolItem& ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
SwWrtShell* GetValue() const { return pWrtSh; }
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index 796b5c0dce5b..eb512826605b 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -69,12 +69,12 @@ public:
/// @return the XModel of the newly inserted chart if successful
css::uno::Reference< css::frame::XModel >
- InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = 0 );
+ InsertChart( css::uno::Reference< css::chart2::data::XDataProvider > &rxDataProvider, bool bFillWithData, const OUString &rCellRange, SwFlyFrameFormat** ppFlyFrameFormat = nullptr );
};
inline SwTableFUNC::SwTableFUNC(SwFrameFormat &rFormat) :
pFormat(&rFormat),
- pSh(0),
+ pSh(nullptr),
bCopy(false)
{
}
diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx
index 523f1aebd052..24fb0e6041b8 100644
--- a/sw/source/uibase/inc/tautofmt.hxx
+++ b/sw/source/uibase/inc/tautofmt.hxx
@@ -80,7 +80,7 @@ class SwAutoFormatDlg : public SfxModalDialog
public:
SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
bool bSetAutoFormat = true,
- const SwTableAutoFormat* pSelFormat = 0 );
+ const SwTableAutoFormat* pSelFormat = nullptr );
virtual ~SwAutoFormatDlg();
virtual void dispose() override;
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index db280d42c315..b339757b7554 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.hxx
@@ -73,7 +73,7 @@ public:
SfxStyleSheetBase& rBase,
sal_uInt16 nRegion,
const OString& sPage = OString(),
- SwWrtShell* pActShell = 0,
+ SwWrtShell* pActShell = nullptr,
bool bNew = false );
virtual void RefreshInputSet() override;
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index 48bb27406b88..d9c57bf22ed5 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -68,9 +68,9 @@ public:
// single argument ctors shall be explicit.
explicit SwTOXDescription(TOXTypes eType) :
eTOXType(eType),
- pTitle(0),
- pTOUName(0),
- pForm(0),
+ pTitle(nullptr),
+ pTOUName(nullptr),
+ pForm(nullptr),
nContent(nsSwTOXElement::TOX_MARK | nsSwTOXElement::TOX_OUTLINELEVEL),
nIndexOptions(nsSwTOIOptions::TOI_SAME_ENTRY|nsSwTOIOptions::TOI_FF|nsSwTOIOptions::TOI_CASE_SENSITIVE),
nOLEOptions(0),
@@ -194,13 +194,13 @@ public:
eTOXType(eType),
nLevel(0),
bMainEntry(false),
- pPrimKey(0),
- pSecKey(0),
- pAltStr(0),
- pTOUName(0),
- pPhoneticReadingOfAltStr(0),
- pPhoneticReadingOfPrimKey(0),
- pPhoneticReadingOfSecKey(0)
+ pPrimKey(nullptr),
+ pSecKey(nullptr),
+ pAltStr(nullptr),
+ pTOUName(nullptr),
+ pPhoneticReadingOfAltStr(nullptr),
+ pPhoneticReadingOfPrimKey(nullptr),
+ pPhoneticReadingOfSecKey(nullptr)
{
}
~SwTOXMarkDescription()
@@ -282,7 +282,7 @@ public:
// methods for directories
- bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = 0, const SfxItemSet* pSet = 0);
+ bool UpdateOrInsertTOX(const SwTOXDescription& rDesc, SwTOXBase** ppBase = nullptr, const SfxItemSet* pSet = nullptr);
const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const;
const SwTOXBase* GetCurTOX();
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 1e573e915344..a1b4414f5c66 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -39,13 +39,13 @@ public:
SwPageFootnoteInfoItem(const SwPageFootnoteInfoItem& rItem );
virtual ~SwPageFootnoteInfoItem();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) 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;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
@@ -59,10 +59,10 @@ class SW_DLLPUBLIC SwPtrItem : public SfxPoolItem
void* pMisc;
public:
- SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = 0);
+ SwPtrItem( const sal_uInt16 nId = FN_PARAM_GRF_DIALOG, void* pPtr = nullptr);
SwPtrItem( const SwPtrItem& rItem );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
void* GetValue() const { return pMisc; }
@@ -77,7 +77,7 @@ public:
SwUINumRuleItem( const SwUINumRuleItem& rItem );
virtual ~SwUINumRuleItem();
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
@@ -92,7 +92,7 @@ class SwBackgroundDestinationItem : public SfxUInt16Item
public:
SwBackgroundDestinationItem(sal_uInt16 nWhich, sal_uInt16 nValue);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
};
class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem
@@ -100,10 +100,10 @@ class SW_DLLPUBLIC SwPaMItem : public SfxPoolItem
SwPaM* m_pPaM;
public:
- SwPaMItem( const sal_uInt16 nId = FN_PARAM_PAM, SwPaM* pPaM = NULL);
+ SwPaMItem( const sal_uInt16 nId = FN_PARAM_PAM, SwPaM* pPaM = nullptr);
SwPaMItem( const SwPaMItem& rItem );
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual bool operator==( const SfxPoolItem& ) const override;
SwPaM* GetValue() const { return m_pPaM; }
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index b95cb12f6d80..3ae07ead1bd2 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -59,7 +59,7 @@ public:
virtual void SAL_CALL disposing(
const css::lang::EventObject& rEventObject ) throw(css::uno::RuntimeException, std::exception) override;
- void ViewDestroyed() { pView = 0; }
+ void ViewDestroyed() { pView = nullptr; }
};
// Clipboard EventListener
@@ -81,7 +81,7 @@ public:
SwClipboardChangeListener( SwView& rView ) : pView( &rView ) {}
virtual ~SwClipboardChangeListener();
- void ViewDestroyed() { pView = 0; }
+ void ViewDestroyed() { pView = nullptr; }
void AddRemoveListener( bool bAdd );
};
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index b8c57ad10c9a..75924b8ea62d 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -232,7 +232,7 @@ public:
// XEventsSupplier
virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) throw( css::uno::RuntimeException, std::exception ) override;
- void Invalidate() {pGlossaries = 0;}
+ void Invalidate() {pGlossaries = nullptr;}
const SwGlossaries* GetGlossaries() { return pGlossaries; }
const OUString& GetGroupName() {return sGroupName;}
const OUString& GetEntryName() {return sEntryName;}
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 630f40c463b9..055167216cad 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -114,7 +114,7 @@ protected:
virtual ~SwXPrintSettings()
throw();
public:
- SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = NULL );
+ SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = nullptr );
//XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 5e37a4ce2f96..4164dd6dfe6d 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -98,8 +98,8 @@ class SW_DLLPUBLIC SwOneExampleFrame
public:
SwOneExampleFrame(vcl::Window& rWin,
sal_uInt32 nStyleFlags = EX_SHOW_ONLINE_LAYOUT,
- const Link<SwOneExampleFrame&,void>* pInitalizedLink = 0,
- const OUString* pURL = 0);
+ const Link<SwOneExampleFrame&,void>* pInitalizedLink = nullptr,
+ const OUString* pURL = nullptr);
~SwOneExampleFrame();
css::uno::Reference< css::frame::XModel > & GetModel() {return _xModel;}
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index f94a55f31482..d95c8e635b57 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -322,7 +322,7 @@ public:
//XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
- void Invalidate(){m_pView = 0;}
+ void Invalidate(){m_pView = nullptr;}
// ITextCursorHelper
virtual const SwPaM* GetPaM() const override;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index ef2f1c934be2..4fef61f60165 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -115,7 +115,7 @@ public:
inline void ResetCursorStack();
SelectionType GetSelectionType() const;
- bool IsModePushed() const { return 0 != m_pModeStack; }
+ bool IsModePushed() const { return nullptr != m_pModeStack; }
void PushMode();
void PopMode();
@@ -151,7 +151,7 @@ public:
bool IsInsMode() const { return m_bIns; }
void SetRedlineModeAndCheckInsMode( sal_uInt16 eMode );
- void EnterSelFrmMode(const Point *pStartDrag = 0);
+ void EnterSelFrmMode(const Point *pStartDrag = nullptr);
void LeaveSelFrmMode();
bool IsSelFrmMode() const { return m_bLayoutMode; }
// reset selection of frames
@@ -177,10 +177,10 @@ public:
// select word / sentence
bool SelNearestWrd();
- bool SelWrd (const Point * = 0, bool bProp=false );
+ bool SelWrd (const Point * = nullptr, bool bProp=false );
// #i32329# Enhanced selection
- void SelSentence (const Point * = 0, bool bProp=false );
- void SelPara (const Point * = 0, bool bProp=false );
+ void SelSentence (const Point * = nullptr, bool bProp=false );
+ void SelPara (const Point * = nullptr, bool bProp=false );
long SelAll();
// basecursortravelling
@@ -220,12 +220,12 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
{ return SimpleMove( &SwWrtShell::_BwdSentence, bSelect ); }
// #i20126# Enhanced table selection
- bool SelectTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
+ bool SelectTableRowCol( const Point& rPt, const Point* pEnd = nullptr, bool bRowDrag = false );
bool SelectTableRow();
bool SelectTableCol();
bool SelectTableCell();
- bool SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr = 0 );
+ bool SelectTextAttr( sal_uInt16 nWhich, const SwTextAttr* pAttr = nullptr );
// per column jumps
bool StartOfColumn ( bool bSelect = false );
@@ -247,7 +247,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
bool PageCrsr(SwTwips lOffset, bool bSelect);
// update fields
- void UpdateInputFields( SwInputFieldList* pLst = 0 );
+ void UpdateInputFields( SwInputFieldList* pLst = nullptr );
void NoEdit(bool bHideCrsr = true);
void Edit();
@@ -290,11 +290,11 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void Insert(const OUString &);
// graphic
void Insert( const OUString &rPath, const OUString &rFilter,
- const Graphic &, SwFlyFrmAttrMgr * = 0,
+ const Graphic &, SwFlyFrmAttrMgr * = nullptr,
bool bRule = false );
void InsertByWord( const OUString & );
- void InsertPageBreak(const OUString *pPageDesc = 0, const ::boost::optional<sal_uInt16>& rPgNum = boost::none);
+ void InsertPageBreak(const OUString *pPageDesc = nullptr, const ::boost::optional<sal_uInt16>& rPgNum = boost::none);
void InsertLineBreak();
void InsertColumnBreak();
void InsertFootnote(const OUString &, bool bEndNote = false, bool bEdit = true );
@@ -302,8 +302,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
bool CanInsert();
// indexes
- void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
- bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = 0);
+ void InsertTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr);
+ bool UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet = nullptr);
// numbering and bullets
/**
@@ -320,16 +320,16 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
//OLE
void InsertObject( /*SvInPlaceObjectRef *pObj, */ // != 0 for clipboard
const svt::EmbeddedObjectRef&,
- SvGlobalName *pName = 0, // != 0 create object accordingly
+ SvGlobalName *pName = nullptr, // != 0 create object accordingly
bool bActivate = true,
sal_uInt16 nSlotId = 0); // SlotId for dialog
- bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = 0 );
+ bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrameFormat **pFlyFrameFormat = nullptr );
void LaunchOLEObj( long nVerb = 0 ); // start server
virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset ) override;
virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
- const SwRect *pFlyPrtRect = 0,
- const SwRect *pFlyFrmRect = 0,
+ const SwRect *pFlyPrtRect = nullptr,
+ const SwRect *pFlyFrmRect = nullptr,
const bool bNoTextFrmPrtAreaChanged = false ) override;
virtual void ConnectObj( svt::EmbeddedObjectRef& xIPObj, const SwRect &rPrt,
const SwRect &rFrm ) override;
@@ -371,14 +371,14 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
sal_uLong SearchTempl (const OUString &rTempl,
SwDocPositions eStart, SwDocPositions eEnd,
FindRanges eFlags = FND_IN_BODY,
- const OUString* pReplTempl = 0 );
+ const OUString* pReplTempl = nullptr );
sal_uLong SearchAttr (const SfxItemSet& rFindSet,
bool bNoColls,
SwDocPositions eStart, SwDocPositions eEnd,
FindRanges eFlags = FND_IN_BODY,
- const css::util::SearchOptions* pSearchOpt = 0,
- const SfxItemSet* pReplaceSet = 0);
+ const css::util::SearchOptions* pSearchOpt = nullptr,
+ const SfxItemSet* pReplaceSet = nullptr);
void AutoCorrect( SvxAutoCorrect& rACorr, sal_Unicode cChar );
@@ -387,9 +387,9 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void MoveCrsr( bool bWithSelect = false );
// update input fields
- bool StartInputFieldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = 0, OString* pWindowState = 0);
+ bool StartInputFieldDlg(SwField*, bool bNextButton, vcl::Window* pParentWin = nullptr, OString* pWindowState = nullptr);
// update DropDown fields
- bool StartDropDownFieldDlg(SwField*, bool bNextButton, OString* pWindowState = 0);
+ bool StartDropDownFieldDlg(SwField*, bool bNextButton, OString* pWindowState = nullptr);
//"Handler" for changes at DrawView - for controls.
virtual void DrawSelChanged( ) override;
@@ -414,10 +414,10 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
SwView& GetView() { return m_rView; }
// Because nobody else is doing it, here is a ExecMacro()
- void ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 );
+ void ExecMacro( const SvxMacro& rMacro, OUString* pRet = nullptr, SbxArray* pArgs = nullptr );
// call into the dark Basic/JavaScript
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- bool bCheckPtr = false, SbxArray* pArgs = 0 );
+ bool bCheckPtr = false, SbxArray* pArgs = nullptr );
// a click at the given field. the cursor is on it.
// execute the predefined actions.
@@ -437,7 +437,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
// automatic update of styles
void AutoUpdateFrame(SwFrameFormat* pFormat, const SfxItemSet& rStyleSet);
- void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = NULL );
+ void AutoUpdatePara(SwTextFormatColl* pColl, const SfxItemSet& rStyleSet, SwPaM* pPaM = nullptr );
// link for inserting ranges via Drag&Drop/Clipboard
DECL_LINK_TYPED( InsertRegionDialog, void*, void );
@@ -445,7 +445,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
// ctor, the first one is a kind of a controlled copy ctor for more views of a document
SwWrtShell( SwWrtShell&, vcl::Window *pWin, SwView &rShell);
SwWrtShell( SwDoc& rDoc, vcl::Window *pWin, SwView &rShell,
- const SwViewOption *pViewOpt = 0);
+ const SwViewOption *pViewOpt = nullptr);
virtual ~SwWrtShell();
bool TryRemoveIndent(); // #i23725#
@@ -463,7 +463,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
bool GotoRegion( const OUString& rName );
bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
sal_uInt16 nSeqNo = 0 );
- bool GotoNextTOXBase( const OUString* pName = 0);
+ bool GotoNextTOXBase( const OUString* pName = nullptr);
bool GotoTable( const OUString& rName );
bool GotoFormatField( const SwFormatField& rField );
const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false);
@@ -526,7 +526,7 @@ private:
Point m_aDest;
bool m_bDestOnStack;
- bool HasCrsrStack() const { return 0 != m_pCrsrStack; }
+ bool HasCrsrStack() const { return nullptr != m_pCrsrStack; }
SAL_DLLPRIVATE bool PushCrsr(SwTwips lOffset, bool bSelect);
SAL_DLLPRIVATE bool PopCrsr(bool bUpdate, bool bSelect = false);
@@ -586,9 +586,9 @@ private:
SAL_DLLPRIVATE void LeaveExtSel() { m_bSelWrd = m_bSelLn = false;}
- SAL_DLLPRIVATE bool GoStart(bool KeepArea = false, bool * = 0,
+ SAL_DLLPRIVATE bool GoStart(bool KeepArea = false, bool * = nullptr,
bool bSelect = false, bool bDontMoveRegion = false);
- SAL_DLLPRIVATE bool GoEnd(bool KeepArea = false, bool * = 0);
+ SAL_DLLPRIVATE bool GoEnd(bool KeepArea = false, bool * = nullptr);
enum BookMarkMove
{
@@ -598,7 +598,7 @@ private:
BOOKMARK_LAST_LAST_ENTRY
};
- SAL_DLLPRIVATE bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=NULL);
+ SAL_DLLPRIVATE bool MoveBookMark(BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark=nullptr);
};
inline void SwWrtShell::ResetCursorStack()