diff options
Diffstat (limited to 'sw/inc')
109 files changed, 496 insertions, 496 deletions
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx index d8331acb9cf9..cba6d26e545d 100644 --- a/sw/inc/HandleAnchorNodeChg.hxx +++ b/sw/inc/HandleAnchorNodeChg.hxx @@ -49,7 +49,7 @@ public: */ SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat, const SwFormatAnchor& _rNewAnchorFormat, - SwFlyFrm* _pKeepThisFlyFrm = 0L ); + SwFlyFrm* _pKeepThisFlyFrm = nullptr ); /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary. diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx index 206617f0a034..d30d4c3aa5a3 100644 --- a/sw/inc/IDocumentUndoRedo.hxx +++ b/sw/inc/IDocumentUndoRedo.hxx @@ -157,7 +157,7 @@ public: @return true if there is a Redo action, false if none */ virtual bool GetFirstRedoInfo(OUString *const o_pStr, - SwUndoId *const o_pId = 0) const = 0; + SwUndoId *const o_pId = nullptr) const = 0; /** Get comments of Redo actions. @return comments of all top-level Redo actions. diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index aab0a46f9194..dbf4ce38d1b6 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -92,7 +92,7 @@ struct FieldShadowState const SwPostItField* mpShadowField; bool bCursor; bool bMouse; - FieldShadowState(): mpShadowField(0),bCursor(false),bMouse(false) + FieldShadowState(): mpShadowField(nullptr),bCursor(false),bMouse(false) { } }; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index e549f42d79c8..a47051303379 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -206,7 +206,7 @@ public: // Invalidate state of whole tree. If an action is open, this call // is processed when the last action ends. void InvalidateStates( AccessibleStates _nStates, - const SwFrm* _pFrm = 0 ); + const SwFrm* _pFrm = nullptr ); void InvalidateRelationSet( const SwFrm* pMaster, const SwFrm* pFollow ); diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 695beed6f7ae..58f42512ca20 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -163,7 +163,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject provided the current object rectangle is taken. */ void AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm, - const SwRect* _pNewObjRect = 0L ); + const SwRect* _pNewObjRect = nullptr ); /** method to notify background of drawing object diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx index 741534d2e7b1..c8a1acd880ad 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -34,7 +34,7 @@ class BigPtrEntry BlockInfo* pBlock; sal_uInt16 nOffset; public: - BigPtrEntry() : pBlock(0), nOffset(0) {} + BigPtrEntry() : pBlock(nullptr), nOffset(0) {} virtual ~BigPtrEntry() {} inline sal_uLong GetPos() const; diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index 436649eb5eb8..491920e1fb13 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -137,11 +137,11 @@ struct SwCalcExp : public SwHash const SwFieldType* pFieldType; SwCalcExp( const OUString& rStr, const SwSbxValue& rVal, - const SwFieldType* pFieldType = 0 ); + const SwFieldType* pFieldType = nullptr ); }; SwHash* Find( const OUString& rSrch, SwHash* const * ppTable, - sal_uInt16 nTableSize, sal_uInt16* pPos = 0 ); + sal_uInt16 nTableSize, sal_uInt16* pPos = nullptr ); void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTableSize ); @@ -203,12 +203,12 @@ public: static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, - LocaleDataWrapper const*const pData = 0 ); + LocaleDataWrapper const*const pData = nullptr ); static bool Str2Double( const OUString& rStr, sal_Int32& rPos, double& rVal, SwDoc *const pDoc ); SW_DLLPUBLIC static bool IsValidVarName( const OUString& rStr, - OUString* pValidName = 0 ); + OUString* pValidName = nullptr ); }; #endif diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 4eb89f1e9c74..7a4d27ce2191 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -58,7 +58,7 @@ public: TYPEINFO_OVERRIDE(); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; static inline const CommandStruct* GetCmds() { return aCmds; } diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index 3f7ae81a3f52..ae7773deb4b0 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -37,7 +37,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr ) { @@ -61,7 +61,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; inline const SwModify* GetDefinedIn() const { return pDefinedIn; } inline void ChgDefinedIn( const SwModify* pNew ) @@ -86,7 +86,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp ) { diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index 11386ef6d48e..a470914ddb8f 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -56,29 +56,29 @@ class SwTableFormula typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&, OUString&, OUString*, void* ) const; - void BoxNmsToPtr( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void PtrToBoxNms( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void RelNmsToBoxNms( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void RelBoxNmsToPtr( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void BoxNmsToRelNm( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; - void _SplitMergeBoxNm( const SwTable&, OUString&, OUString&, OUString* = 0, - void* pPara = 0 ) const; + void BoxNmsToPtr( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void PtrToBoxNms( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void RelNmsToBoxNms( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void RelBoxNmsToPtr( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void BoxNmsToRelNm( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; + void _SplitMergeBoxNm( const SwTable&, OUString&, OUString&, OUString* = nullptr, + void* pPara = nullptr ) const; static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd, SwSelBoxes& rBoxes ); OUString ScanString( FnScanFormula fnFormula, const SwTable& rTable, - void* = 0 ) const; + void* = nullptr ) const; static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm ); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index cda2ccf0296d..6de3f8a82452 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -121,8 +121,8 @@ struct SwContentAtPos SwContentAtPos( int eGetAtPos = 0xffff ) : eContentAtPos( (IsAttrAtPos)eGetAtPos ) { - aFnd.pField = 0; - pFndTextAttr = 0; + aFnd.pField = nullptr; + pFndTextAttr = nullptr; nDist = 0; // #i23726# } @@ -257,7 +257,7 @@ private: SAL_DLLPRIVATE bool LRMargin( bool, bool bAPI = false ); SAL_DLLPRIVATE bool IsAtLRMargin( bool, bool bAPI = false ) const; - SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const; + SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = nullptr ) const; SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr); @@ -300,7 +300,7 @@ protected: public: TYPEINFO_OVERRIDE(); - SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0 ); + SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr ); // disguised copy constructor SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin ); virtual ~SwCrsrShell(); @@ -378,14 +378,14 @@ public: sal_uLong Find( const SwTextFormatColl& rFormatColl, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, - FindRanges eRng, const SwTextFormatColl* pReplFormat = 0 ); + FindRanges eRng, const SwTextFormatColl* pReplFormat = nullptr ); sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions eStart, SwDocPositions eEnd, bool& bCancel, FindRanges eRng, - const css::util::SearchOptions* pSearchOpt = 0, - const SfxItemSet* rReplSet = 0 ); + const css::util::SearchOptions* pSearchOpt = nullptr, + const SfxItemSet* rReplSet = nullptr ); // Position the Cursor // return values: @@ -634,10 +634,10 @@ public: const SwShellCrsr* getShellCrsr( bool bBlock ) const { return (const_cast<SwCrsrShell*>(this))->getShellCrsr( bBlock ); } - bool IsBlockMode() const { return 0 != m_pBlockCrsr; } + bool IsBlockMode() const { return nullptr != m_pBlockCrsr; } // is the Crsr in a table and is the selection over 2 columns - bool IsTableMode() const { return 0 != m_pTableCrsr; } + bool IsTableMode() const { return nullptr != m_pTableCrsr; } const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; } SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; } @@ -656,10 +656,10 @@ public: bool bInHeader = true ); // is point of cursor in header/footer. pbInHeader return true if it is // in a headerframe otherwise in a footerframe - bool IsInHeaderFooter( bool* pbInHeader = 0 ) const; + bool IsInHeaderFooter( bool* pbInHeader = nullptr ) const; - bool GotoNextTOXBase( const OUString* = 0 ); - bool GotoPrevTOXBase( const OUString* = 0 ); + bool GotoNextTOXBase( const OUString* = nullptr ); + bool GotoPrevTOXBase( const OUString* = nullptr ); bool GotoTOXMarkBase(); // jump to the next or previous index entry bool GotoNxtPrvTOXMark( bool bNext = true ); @@ -721,7 +721,7 @@ public: bool GoNextSentence(); bool GoStartSentence(); bool GoEndSentence(); - bool SelectWord( const Point* pPt = 0 ); + bool SelectWord( const Point* pPt = nullptr ); bool ExpandToSentenceBorders(); // get position from current cursor @@ -766,7 +766,7 @@ public: bool GetContentAtPos( const Point& rPt, SwContentAtPos& rContentAtPos, bool bSetCrsr = false, - SwRect* pFieldRect = 0 ); + SwRect* pFieldRect = nullptr ); const SwPostItField* GetPostItFieldAtCursor() const; @@ -784,15 +784,15 @@ public: bool IsPageAtPos( const Point &rPt ) const; - bool SelectTextAttr( sal_uInt16 nWhich, bool bExpand, const SwTextAttr* pAttr = 0 ); + bool SelectTextAttr( sal_uInt16 nWhich, bool bExpand, const SwTextAttr* pAttr = nullptr ); bool GotoINetAttr( const SwTextINetFormat& rAttr ); const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const; bool SelectText( const sal_Int32 nStart, const sal_Int32 nEnd ); - bool CheckTableBoxContent( const SwPosition* pPos = 0 ); - void SaveTableBoxContent( const SwPosition* pPos = 0 ); + bool CheckTableBoxContent( const SwPosition* pPos = nullptr ); + void SaveTableBoxContent( const SwPosition* pPos = nullptr ); void ClearTableBoxContent(); bool EndAllTableBoxEdit(); @@ -811,9 +811,9 @@ public: const SwRangeRedline* GotoRedline( sal_uInt16 nArrPos, bool bSelect = false ); // is cursor or the point in/over a vertical formatted text? - bool IsInVerticalText( const Point* pPt = 0 ) const; + bool IsInVerticalText( const Point* pPt = nullptr ) const; // is cursor or the point in/over a right to left formatted text? - bool IsInRightToLeftText( const Point* pPt = 0 ) const; + bool IsInRightToLeftText( const Point* pPt = nullptr ) const; static void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); bool bColumnChange(); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index ca7fc51e3540..07b984077d3d 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -178,7 +178,7 @@ struct SwMergeDescriptor bPrintAsync( false ), bCreateSingleFile( false ), bSubjectIsFilename( false ), - pMailMergeConfigItem(0) + pMailMergeConfigItem(nullptr) {} }; @@ -357,7 +357,7 @@ public: the filename returned by a file picker and additional settings dialog. In case of success it returns the registered name, otherwise an empty string. */ - static OUString LoadAndRegisterDataSource(SwDocShell* pDocShell = 0); + static OUString LoadAndRegisterDataSource(SwDocShell* pDocShell = nullptr); /** Loads a data source from file and registers it. @@ -367,16 +367,16 @@ public: */ static OUString LoadAndRegisterDataSource(const DBConnURITypes type, const css::uno::Any &rUnoURI, const css::uno::Reference < css::beans::XPropertySet > *pSettings, - const OUString &rURI, const OUString *pPrefix = 0, const OUString *pDestDir = 0, - SwDocShell* pDocShell = 0); + const OUString &rURI, const OUString *pPrefix = nullptr, const OUString *pDestDir = nullptr, + SwDocShell* pDocShell = nullptr); /** Loads a data source from file and registers it. Convenience function, which calls GetDBunoURI and has just one mandatory parameter. In case of success it returns the registered name, otherwise an empty string. */ - static OUString LoadAndRegisterDataSource(const OUString& rURI, const OUString *pPrefix = 0, const OUString *pDestDir = 0, - const css::uno::Reference < css::beans::XPropertySet > *pSettings = 0); + static OUString LoadAndRegisterDataSource(const OUString& rURI, const OUString *pPrefix = nullptr, const OUString *pDestDir = nullptr, + const css::uno::Reference < css::beans::XPropertySet > *pSettings = nullptr); /// Load the embedded data source of the document and also register it. void LoadAndRegisterEmbeddedDataSource(const SwDBData& rData, const SwDocShell& rDocShell); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index b5ca6c211e0a..1b3d20bb17b4 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -400,8 +400,8 @@ class SwDrawContact : public SwContact virtual SdrObject* GetMaster() override; virtual void SetMaster( SdrObject* _pNewMaster ) override; - const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = 0L ) const; - SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = 0L ); + const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = nullptr ) const; + SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = nullptr ); inline const SwPageFrm* GetPageFrm() const { @@ -421,7 +421,7 @@ class SwDrawContact : public SwContact /** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm). The anchor is determined according to the attribute SwFormatAnchor. If required the object gets unregistered with the old anchor. */ - void ConnectToLayout( const SwFormatAnchor *pAnch = 0 ); + void ConnectToLayout( const SwFormatAnchor *pAnch = nullptr ); /** method to insert 'master' drawing object into drawing page */ void InsertMasterIntoDrawPage(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 46ee9e2aa953..b13679c5b73e 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -398,7 +398,7 @@ private: SwFlyFrameFormat* _MakeFlySection( const SwPosition& rAnchPos, const SwContentNode& rNode, RndStdIds eRequestId, const SfxItemSet* pFlyAttrSet, - SwFrameFormat* = 0 ); + SwFrameFormat* = nullptr ); sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms ); typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool ); @@ -626,7 +626,7 @@ public: have to be surrounded completely by css::awt::Selection. ( Start < Pos < End ) !!! (Required for Writers.) */ - SwPosFlyFrms GetAllFlyFormats( const SwPaM* = 0, + SwPosFlyFrms GetAllFlyFormats( const SwPaM* = nullptr, bool bDrawAlso = false, bool bAsCharAlso = false ) const; @@ -649,12 +649,12 @@ public: */ SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType, const SwPosition* pAnchorPos, - const SfxItemSet* pSet = 0, - SwFrameFormat *pParent = 0, + const SfxItemSet* pSet = nullptr, + SwFrameFormat *pParent = nullptr, bool bCalledFromShell = false ); SwFlyFrameFormat* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, - const SwSelBoxes* pSelBoxes = 0, - SwFrameFormat *pParent = 0 ); + const SwSelBoxes* pSelBoxes = nullptr, + SwFrameFormat *pParent = nullptr ); //UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex // and evtl. corrects that items to ensure unique names for that type. This call may @@ -666,7 +666,7 @@ public: bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet ); bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat, - SfxItemSet* pSet = 0, bool bKeepOrient = false ); + SfxItemSet* pSet = nullptr, bool bKeepOrient = false ); void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat, const OUString& sNewTitle ); void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat, @@ -690,7 +690,7 @@ public: css::uno::Any Spell( SwPaM&, css::uno::Reference< css::linguistic2::XSpellChecker1 > &, sal_uInt16* pPageCnt, sal_uInt16* pPageSt, bool bGrammarCheck, - SwConversionArgs *pConvArgs = 0 ) const; + SwConversionArgs *pConvArgs = nullptr ) const; css::uno::Reference< css::linguistic2::XHyphenatedWord > Hyphenate( SwPaM *pPam, const Point &rCrsrPos, @@ -708,9 +708,9 @@ public: bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const; short GetTextDirection( const SwPosition& rPos, - const Point* pPt = 0 ) const; + const Point* pPt = nullptr ) const; bool IsInVerticalText( const SwPosition& rPos, - const Point* pPt = 0 ) const; + const Point* pPt = nullptr ) const; // Database and DB-Manager void SetDBManager( SwDBManager* pNewMgr ) { mpDBManager = pNewMgr; } @@ -721,7 +721,7 @@ public: // Find out which databases are used by fields. void GetAllUsedDB( std::vector<OUString>& rDBNameList, - const std::vector<OUString>* pAllDBNames = 0 ); + const std::vector<OUString>* pAllDBNames = nullptr ); void ChgDBData( const SwDBData& rNewData ); SwDBData GetDBData(); @@ -905,7 +905,7 @@ public: // travel over PaM Ring bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry, - SwPaM& rPaM, SwCrsrShell* pShell = 0); + SwPaM& rPaM, SwCrsrShell* pShell = nullptr); /** get the set of printable pages for the XRenderable API by evaluating the respective settings (see implementation) */ @@ -945,7 +945,7 @@ public: void DelPageDesc( const OUString & rName, bool bBroadcast = false); void DelPageDesc( size_t i, bool bBroadcast = false ); void PreDelPageDesc(SwPageDesc * pDel); - SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = 0, + SwPageDesc* MakePageDesc(const OUString &rName, const SwPageDesc* pCpy = nullptr, bool bRegardLanguage = true, bool bBroadcast = false); void BroadcastStyleOperation(const OUString& rName, SfxStyleFamily eFamily, @@ -965,11 +965,11 @@ public: // Insert/Renew table/indes SwTOXBaseSection* InsertTableOf( const SwPosition& rPos, const SwTOXBase& rTOX, - const SfxItemSet* pSet = 0, + const SfxItemSet* pSet = nullptr, bool bExpand = false ); const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd, const SwTOXBase& rTOX, - const SfxItemSet* pSet = 0 ); + const SfxItemSet* pSet = nullptr ); static SwTOXBase* GetCurTOX( const SwPosition& rPos ); static const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX); @@ -1103,7 +1103,7 @@ public: // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode> sal_uInt16 MakeNumRule( const OUString &rName, - const SwNumRule* pCpy = 0, + const SwNumRule* pCpy = nullptr, bool bBroadcast = false, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode = SvxNumberFormat::LABEL_WIDTH_AND_POSITION ); @@ -1114,7 +1114,7 @@ public: bool RenameNumRule(const OUString & aOldName, const OUString & aNewName, bool bBroadcast = false); bool DelNumRule( const OUString& rName, bool bBroadCast = false ); - OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const; + OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const; void UpdateNumRule(); // Update all invalids. void ChgNumRuleFormats( const SwNumRule& rRule ); @@ -1123,9 +1123,9 @@ public: // Goto next/previous on same level. static bool GotoNextNum( SwPosition&, bool bOverUpper = true, - sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 ); + sal_uInt8* pUpper = nullptr, sal_uInt8* pLower = nullptr ); static bool GotoPrevNum( SwPosition&, bool bOverUpper = true, - sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 ); + sal_uInt8* pUpper = nullptr, sal_uInt8* pLower = nullptr ); /** Searches for a text node with a numbering rule. @@ -1190,8 +1190,8 @@ public: const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER const SwPosition& rPos, sal_uInt16 nRows, sal_uInt16 nCols, short eAdjust, - const SwTableAutoFormat* pTAFormat = 0, - const std::vector<sal_uInt16> *pColArr = 0, + const SwTableAutoFormat* pTAFormat = nullptr, + const std::vector<sal_uInt16> *pColArr = nullptr, bool bCalledFromShell = false, bool bNewModel = true ); @@ -1203,7 +1203,7 @@ public: const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER, const SwPaM& rRange, sal_Unicode cCh, short eAdjust, - const SwTableAutoFormat* = 0 ); + const SwTableAutoFormat* = nullptr ); // text to table conversion - API support const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes ); @@ -1238,13 +1238,13 @@ public: // From FEShell (for Undo and BModified). static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = 0 ); + const SwCellFrm* pBoxFrm = nullptr ); void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly, - const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 ); + const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = nullptr ); static void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = 0 ); + const SwCellFrm* pBoxFrm = nullptr ); void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCrsr, - const SwCellFrm* pBoxFrm = 0 ); + const SwCellFrm* pBoxFrm = nullptr ); // Direct access for UNO. void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld, @@ -1276,15 +1276,15 @@ public: void ClearLineNumAttrs( SwPosition & rPos ); bool InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes, - const SwTable* pCpyTable = 0, bool bCpyName = false, + const SwTable* pCpyTable = nullptr, bool bCpyName = false, bool bCorrPos = false ); bool UnProtectCells( const OUString& rTableName ); bool UnProtectCells( const SwSelBoxes& rBoxes ); bool UnProtectTables( const SwPaM& rPam ); bool HasTableAnyProtection( const SwPosition* pPos, - const OUString* pTableName = 0, - bool* pFullTableProtection = 0 ); + const OUString* pTableName = nullptr, + bool* pFullTableProtection = nullptr ); // Split table at baseline position, i.e. create a new table. bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0, @@ -1312,7 +1312,7 @@ public: /** @return names of all references that are set in document. If array pointer is 0 return only whether a RefMark is set in document. */ - sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const; + sal_uInt16 GetRefMarks( std::vector<OUString>* = nullptr ) const; // Insert label. If a FlyFormat is created, return it. SwFlyFrameFormat* InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator, @@ -1339,18 +1339,18 @@ public: // insert section (the ODF kind of section, not the nodesarray kind) SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &, - SwTOXBase const*const pTOXBase = 0, - SfxItemSet const*const pAttr = 0, bool const bUpdate = true); + SwTOXBase const*const pTOXBase = nullptr, + SfxItemSet const*const pAttr = nullptr, bool const bUpdate = true); static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange, - const SwNode** ppSttNd = 0 ); + const SwNode** ppSttNd = nullptr ); static SwSection* GetCurrSection( const SwPosition& rPos ); SwSectionFormats& GetSections() { return *mpSectionFormatTable; } const SwSectionFormats& GetSections() const { return *mpSectionFormatTable; } SwSectionFormat *MakeSectionFormat( SwSectionFormat *pDerivedFrom ); void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false ); void UpdateSection(size_t const nSect, SwSectionData &, - SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false); - OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const; + SfxItemSet const*const = nullptr, bool const bPreventLinkUpdate = false); + OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; /* @@@MAINTAINABILITY-HORROR@@@ The model should not have anything to do with a shell. @@ -1404,11 +1404,11 @@ public: const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const; // Call into intransparent Basic; expect possible Return String. - bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 ); + bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = nullptr, SbxArray* pArgs = nullptr ); // Call into intransparent Basic / JavaScript. sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent, - bool bChkPtr = false, SbxArray* pArgs = 0 ); + bool bChkPtr = false, SbxArray* pArgs = nullptr ); /** Adjust left margin via object bar (similar to adjustment of numerations). One can either change the margin "by" adding or subtracting a given @@ -1431,10 +1431,10 @@ public: // Create sub-documents according to given collection. // If no collection is given, use chapter styles for 1st level. bool GenerateGlobalDoc( const OUString& rPath, - const SwTextFormatColl* pSplitColl = 0 ); + const SwTextFormatColl* pSplitColl = nullptr ); bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 ); bool GenerateHTMLDoc( const OUString& rPath, - const SwTextFormatColl* pSplitColl = 0 ); + const SwTextFormatColl* pSplitColl = nullptr ); bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 ); // Compare two documents. @@ -1448,7 +1448,7 @@ public: // For AutoFormat: with Undo/Redlining. void SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId, - const SfxItemSet* pSet = 0 ); + const SfxItemSet* pSet = nullptr ); void SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& ); // Only for SW-textbloxks! Does not pay any attention to layout! @@ -1638,7 +1638,7 @@ public: * Dumps the entire nodes structure to the given destination (file nodes.xml in the current directory by default) * @since 3.5 */ - void dumpAsXml(struct _xmlTextWriter* = 0) const; + void dumpAsXml(struct _xmlTextWriter* = nullptr) const; std::set<Color> GetDocColors(); std::vector< std::weak_ptr<SwUnoCrsr> > mvUnoCrsrTbl; diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index d319c70aaa19..07246188f681 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -199,7 +199,7 @@ public: bool Insert( SwRangeRedline* p, bool bIns = true ); bool Insert( SwRangeRedline* p, sal_uInt16& rInsPos, bool bIns = true ); - bool InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos = 0 ); + bool InsertWithValidRanges( SwRangeRedline* p, sal_uInt16* pInsPos = nullptr ); void Remove( sal_uInt16 nPos ); bool Remove( const SwRangeRedline* p ); diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx index 35827e09a4b2..cf073a9398ba 100644 --- a/sw/inc/docfac.hxx +++ b/sw/inc/docfac.hxx @@ -29,7 +29,7 @@ protected: SwDoc* pDoc; public: - SwDocFac( SwDoc *pDoc = 0 ); + SwDocFac( SwDoc *pDoc = nullptr ); ~SwDocFac(); /// Document is created after calling Read(...). diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index a5871daa85e5..bf20d9ba2015 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -127,19 +127,19 @@ class SW_DLLPUBLIC SwDocShell sal_uInt16 nMask, const bool bNew, const OString& sPageId = OString(), - SwWrtShell* pActShell = 0, + SwWrtShell* pActShell = nullptr, const bool bBasic = false ); SAL_DLLPRIVATE bool Delete(const OUString &rName, sal_uInt16 nFamily); SAL_DLLPRIVATE bool Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden); SAL_DLLPRIVATE sal_uInt16 ApplyStyles(const OUString &rName, const sal_uInt16 nFamily, - SwWrtShell* pShell = 0, + SwWrtShell* pShell = nullptr, sal_uInt16 nMode = 0); SAL_DLLPRIVATE sal_uInt16 DoWaterCan( const OUString &rName, sal_uInt16 nFamily); - SAL_DLLPRIVATE sal_uInt16 UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0); + SAL_DLLPRIVATE sal_uInt16 UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = nullptr); SAL_DLLPRIVATE sal_uInt16 MakeByExample(const OUString &rName, - sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0); + sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = nullptr); SAL_DLLPRIVATE void SubInitNew(); ///< for InitNew and HtmlSourceMode. @@ -192,7 +192,7 @@ public: void ExecStyleSheet(SfxRequest&); void GetState(SfxItemSet &); - void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = 0 ); + void StateStyleSheet(SfxItemSet&, SwWrtShell* pSh = nullptr ); /// returns Doc. But be careful! inline SwDoc* GetDoc() { return m_pDoc; } @@ -229,7 +229,7 @@ public: /// For inserting document. Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, - SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0); + SwCrsrShell* pCrsrSh = nullptr, SwPaM* pPaM = nullptr); #if defined WNT virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index d18bf72b8a4f..34b083efeb77 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -140,7 +140,7 @@ public: OUString Expand( sal_uInt32 nFormat, short nOff, sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage, const OUString& ) const; void ChangeExpansion( SwDoc* pDoc, - bool bVirtPageNum, const sal_Int16* pNumFormat = 0 ); + bool bVirtPageNum, const sal_Int16* pNumFormat = nullptr ); virtual SwFieldType* Copy() const override; }; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index a0a47ce8a719..cbb00fd0fab4 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -53,7 +53,7 @@ public: virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; protected: - void lateInit(const SwDPage& rPage, SwDrawModel* pNewModel = 0); + void lateInit(const SwDPage& rPage, SwDrawModel* pNewModel = nullptr); private: SwDPage(const SwDPage& rSrcPage); diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx index 42b3f0b1bf37..53ba14d7497a 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -48,9 +48,9 @@ public: /// Query contents. GlobalDocContentType GetType() const { return eType; } const SwSection* GetSection() const - { return GLBLDOC_SECTION == eType ? PTR.pSect : 0; } + { return GLBLDOC_SECTION == eType ? PTR.pSect : nullptr; } const SwTOXBase* GetTOX() const - { return GLBLDOC_TOXBASE == eType ? PTR.pTOX : 0; } + { return GLBLDOC_TOXBASE == eType ? PTR.pTOX : nullptr; } sal_uLong GetDocPos() const { return nDocPos; } /// For sorting. diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 1469997b2b44..74605baa5749 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell that will be used by GetGraphic() and GetGraphicSize(). */ SAL_DLLPRIVATE SwGrfNode *_GetGrfNode() const ; - SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = 0 ); + SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = nullptr ); SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); @@ -200,13 +200,13 @@ public: void SetLinkUpdMode( sal_uInt16 nMode ); /// Copy content of all ranges at current position of cursor to given Shell. - bool Copy( SwEditShell* pDestShell = 0 ); + bool Copy( SwEditShell* pDestShell = nullptr ); /** For copying via ClipBoard: If table is copied into table, move all cursors away from it. Copy and Paste must be in FEShell because of FlyFrames! Copy all selections to the document. */ - bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 ); + bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = nullptr ); long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true ); bool AppendTextNode(); @@ -295,7 +295,7 @@ public: SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const; SwCharFormat* GetCurCharFormat() const; void FillByEx(SwCharFormat*, bool bReset = false); - SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = 0 ); + SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = nullptr ); SwCharFormat* FindCharFormatByName( const OUString& rName ) const; /* FormatCollections (new) - Explaining the general naming pattern: @@ -337,7 +337,7 @@ public: /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)> void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false); SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName, - SwTextFormatColl *pDerivedFrom = 0); + SwTextFormatColl *pDerivedFrom = nullptr); void FillByEx(SwTextFormatColl*, bool bReset = false); SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const; @@ -381,7 +381,7 @@ public: void ChangeDBFields( const std::vector<OUString>& rOldNames, const OUString& rNewName ); void GetAllUsedDB( std::vector<OUString>& rDBNameList, - std::vector<OUString>* pAllDBNames = 0 ); + std::vector<OUString>* pAllDBNames = nullptr ); bool IsAnyDatabaseFieldInDoc()const; @@ -419,9 +419,9 @@ public: /// Insert content table. Renew if required. void InsertTableOf(const SwTOXBase& rTOX, - const SfxItemSet* pSet = 0); + const SfxItemSet* pSet = nullptr); bool UpdateTableOf(const SwTOXBase& rTOX, - const SfxItemSet* pSet = 0); + const SfxItemSet* pSet = nullptr); const SwTOXBase* GetCurTOX() const; const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false ); void SetDefaultTOXBase(const SwTOXBase& rBase); @@ -521,7 +521,7 @@ public: bool SelectionHasNumber() const; bool SelectionHasBullet() const; - OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const; + OUString GetUniqueNumRuleName( const OUString* pChkStr = nullptr, bool bAutoNum = true ) const; void ChgNumRuleFormats( const SwNumRule& rRule ); /// Set (and query if) a numbering with StartFlag starts at current PointPos. @@ -552,10 +552,10 @@ public: void DelAllUndoObj(); /// Undo: set up Undo parenthesis, return nUndoId of this parenthesis. - SwUndoId StartUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = 0 ); + SwUndoId StartUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = nullptr ); /// Closes parenthesis of nUndoId, not used by UI. - SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = 0 ); + SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = nullptr ); bool GetLastUndoInfo(OUString *const o_pStr, SwUndoId *const o_pId) const; @@ -617,12 +617,12 @@ public: else give a rap on the knuckles! If a string-ptr != 0 return the respective name. */ void GetGrfNms( OUString* pGrfName, OUString* pFltName, - const SwFlyFrameFormat* = 0 ) const; + const SwFlyFrameFormat* = nullptr ) const; /// Re-read if graphic is not ok. Current graphic is replaced by the new one. void ReRead( const OUString& rGrfName, const OUString& rFltName, - const Graphic* pGraphic = 0, - const GraphicObject* pGrafObj = 0 ); + const Graphic* pGraphic = nullptr, + const GraphicObject* pGrafObj = nullptr ); /// Unique identification of object (for ImageMapDlg). void *GetIMapInventor() const; @@ -656,7 +656,7 @@ public: including styles. */ sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const OUString& rName, const OUString& rShortName, bool bSaveRelFile = false, - const OUString* pOnlyText=0 ); + const OUString* pOnlyText=nullptr ); /// Save complete content of doc as glossary. sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const OUString& rName, @@ -681,7 +681,7 @@ public: const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_uInt16 nRows, sal_uInt16 nCols, sal_Int16 eAdj = css::text::HoriOrientation::FULL, - const SwTableAutoFormat* pTAFormat = 0 ); + const SwTableAutoFormat* pTAFormat = nullptr ); void InsertDDETable( const SwInsertTableOptions& rInsTableOpts, ///< HEADLINE_NO_BORDER SwDDEFieldType* pDDEType, @@ -695,7 +695,7 @@ public: bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR sal_Unicode cCh, sal_Int16 eAdj = css::text::HoriOrientation::FULL, - const SwTableAutoFormat* pTAFormat = 0 ); + const SwTableAutoFormat* pTAFormat = nullptr ); bool TableToText( sal_Unicode cCh ); bool IsTextToTableAvailable() const; @@ -715,7 +715,7 @@ public: Can Merge checks if Prev or Next are possible. If pointer pChkNxtPrv is passed possible direction is given. */ - bool CanMergeTable( bool bWithPrev = true, bool* pChkNxtPrv = 0 ) const; + bool CanMergeTable( bool bWithPrev = true, bool* pChkNxtPrv = nullptr ) const; bool MergeTable( bool bWithPrev = true, sal_uInt16 nMode = 0 ); /// Set up InsertDB as table Undo. @@ -725,13 +725,13 @@ public: /// Save selections. void SpellStart( SwDocPositions eStart, SwDocPositions eEnd, - SwDocPositions eCurr, SwConversionArgs *pConvArgs = 0 ); + SwDocPositions eCurr, SwConversionArgs *pConvArgs = nullptr ); /// Restore selections. - void SpellEnd( SwConversionArgs *pConvArgs = 0, bool bRestoreSelection = true ); + void SpellEnd( SwConversionArgs *pConvArgs = nullptr, bool bRestoreSelection = true ); css::uno::Any SpellContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt, - SwConversionArgs *pConvArgs = 0 ); + SwConversionArgs *pConvArgs = nullptr ); /** Spells on a sentence basis - the SpellPortions are needed @return false if no error could be found. */ @@ -772,7 +772,7 @@ public: /** @return names of all references set in document. If ArrayPointer == 0 then return only whether a RefMark is set in document. */ - sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const; + sal_uInt16 GetRefMarks( std::vector<OUString>* = nullptr ) const; /// Call AutoCorrect void AutoCorrect( SvxAutoCorrect& rACorr, bool bInsertMode, @@ -780,7 +780,7 @@ public: bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord ); /// Set our styles according to the respective rules. - void AutoFormat( const SvxSwAutoFormatFlags* pAFlags = 0 ); + void AutoFormat( const SvxSwAutoFormatFlags* pAFlags = nullptr ); static SvxSwAutoFormatFlags* GetAutoFormatFlags(); static void SetAutoFormatFlags(SvxSwAutoFormatFlags *); @@ -803,7 +803,7 @@ public: sal_uInt16 GetLineCount( bool bActPos = true ); /// Query and set footnote-text/number. Set.. to current SSelection! - bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = 0 ); + bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = nullptr ); bool SetCurFootnote( const SwFormatFootnote& rFillFootnote ); bool HasFootnotes( bool bEndNotes = false ) const; @@ -811,7 +811,7 @@ public: /// @return list of all footnotes and their first portions of text. SwSection const* InsertSection( - SwSectionData & rNewData, SfxItemSet const*const = 0 ); + SwSectionData & rNewData, SfxItemSet const*const = nullptr ); bool IsInsRegionAvailable() const; const SwSection* GetCurrSection() const; @@ -820,22 +820,22 @@ public: a footnote the reference of which is in a columned range. If bOutOfTab is set, the range comprising the table is searched and not an inner one. */ - SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = 0 ); + SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = nullptr ); size_t GetSectionFormatCount() const; size_t GetSectionFormatPos(const SwSectionFormat&) const; const SwSectionFormat& GetSectionFormat(size_t nFormat) const; void DelSectionFormat( size_t nFormat); void UpdateSection( size_t const nSect, SwSectionData &, - SfxItemSet const*const = 0); + SfxItemSet const*const = nullptr); bool IsAnySectionInDoc( bool bChkReadOnly = false, bool bChkHidden = false, bool BChkTOX = false ) const; - OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const; + OUString GetUniqueSectionName( const OUString* pChkStr = nullptr ) const; /// Set attributes. - void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = 0); + void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = nullptr); /** Search inside the cursor selection for full selected sections. if any part of section in the selection @return 0. @@ -927,7 +927,7 @@ public: /// Interface for TextInputData - (for input of Japanese/Chinese chars.) SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); - OUString DeleteExtTextInput( SwExtTextInput* pDel = 0, bool bInsText = true); + OUString DeleteExtTextInput( SwExtTextInput* pDel = nullptr, bool bInsText = true); void SetExtTextInputData( const CommandExtTextInputData& ); /// Interface for access to AutoComplete-list. @@ -938,7 +938,7 @@ public: sal_uInt16 GetScalingOfSelectedText() const; /// Ctor/Dtor. - SwEditShell( SwDoc&, vcl::Window*, const SwViewOption *pOpt = 0 ); + SwEditShell( SwDoc&, vcl::Window*, const SwViewOption *pOpt = nullptr ); /// Copy-Constructor in disguise. SwEditShell( SwEditShell&, vcl::Window* ); diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx index fb7f4427a34d..6e41d9559c38 100644 --- a/sw/inc/extinput.hxx +++ b/sw/inc/extinput.hxx @@ -33,7 +33,7 @@ class SwExtTextInput : public SwPaM bool bIsOverwriteCursor : 1; LanguageType eInputLanguage; public: - SwExtTextInput( const SwPaM& rPam, Ring* pRing = 0 ); + SwExtTextInput( const SwPaM& rPam, Ring* pRing = nullptr ); virtual ~SwExtTextInput(); void SetInputData( const CommandExtTextInputData& rData ); diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index a3055f05a19c..6e6ad6b86254 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -33,7 +33,7 @@ class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient SwTextCharFormat* pTextAttr; ///< My text attribute. public: - SwFormatCharFormat() : pTextAttr(0) {} + SwFormatCharFormat() : pTextAttr(nullptr) {} /// single argument ctors shall be explicit. explicit SwFormatCharFormat( SwCharFormat *pFormat ); @@ -53,12 +53,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index b589480a2312..6ea8b19986ac 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -157,7 +157,7 @@ struct SwGetCurColNumPara { const SwFrameFormat* pFrameFormat; const SwRect* pPrtRect, *pFrmRect; - SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {} + SwGetCurColNumPara() : pFrameFormat( nullptr ), pPrtRect( nullptr ), pFrmRect( nullptr ) {} }; enum class SwPasteSdr @@ -218,7 +218,7 @@ private: /** Used for mouse operations on a table: @return a cell frame that is 'close' to rPt. */ - SAL_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const; + SAL_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const; // 0 == not in any column. SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm, @@ -249,12 +249,12 @@ public: using SwEditShell::Insert; TYPEINFO_OVERRIDE(); - SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = 0 ); + SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr ); SwFEShell( SwEditShell& rShell, vcl::Window *pWin ); virtual ~SwFEShell(); /// Copy and Paste methods for internal clipboard. - bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = 0 ); + bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = nullptr ); bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false); /// Paste some pages into another doc - used in mailmerge. @@ -271,7 +271,7 @@ public: /** If an object as been given, exactly this object is selected (instead of searching over position). */ - bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 ); + bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = nullptr ); void DelSelectedObj(); /** Move selection upwards or downwards (Z-Order). @@ -315,7 +315,7 @@ public: bool IsSelContainsControl() const; ObjCntType GetObjCntType( const Point &rPt, SdrObject *&rpObj ) const; - ObjCntType GetObjCntTypeOfSelection( SdrObject** ppObj = 0 ) const; + ObjCntType GetObjCntTypeOfSelection( SdrObject** ppObj = nullptr ) const; /// For adjustment of PosAttr when anchor changes. SwRect GetObjRect() const; @@ -335,7 +335,7 @@ public: bool _bMirror = false, Point* _opRef = nullptr, Size* _opPercent = nullptr, - const SwFormatFrmSize* pFormatFrmSize = 0 ) const; + const SwFormatFrmSize* pFormatFrmSize = nullptr ) const; /// Set size of draw objects. void SetObjRect( const SwRect& rRect ); @@ -359,7 +359,7 @@ public: /** @return FrameFormat of object that may be under Point. Object does not become selected! */ - const SwFrameFormat* GetFormatFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const; + const SwFrameFormat* GetFormatFromObj( const Point& rPt, SwRect** pRectToFill = nullptr ) const; /// @return a format too, if the point is over the text of any fly. const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const; @@ -381,9 +381,9 @@ public: bool GetFlyFrmAttr( SfxItemSet &rSet ) const; bool SetFlyFrmAttr( SfxItemSet &rSet ); static SfxItemSet makeItemSetFromFormatAnchor(SfxItemPool& rPool, const SwFormatAnchor &rAnchor); - bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 ); + bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = nullptr ); const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false, - SwFrameFormat *pParent = 0 ); + SwFrameFormat *pParent = nullptr ); void SetFlyPos( const Point &rAbsPos); Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false ); @@ -393,7 +393,7 @@ public: bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const; SwFrameFormat* GetSelectedFrameFormat() const; ///< If frame then frame style, else 0. - void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style. + void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = nullptr ); ///< If frame then set frame style. // Get selected fly SwFlyFrm* GetSelectedFlyFrm() const; @@ -438,8 +438,8 @@ public: If a pointer is passed on a size, this is the object's current core-size. Else the size is provided via GetCurFlyRect(). */ 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 ) = 0; /** Connect objects with ActivateWhenVisible at Paint. @@ -470,9 +470,9 @@ public: bool bSelFrame = true ); /// Position is a graphic with URL? - const SwFrameFormat* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0, - OUString *pTargetFrameName = 0, - OUString *pURLDescription = 0 ) const; + const SwFrameFormat* IsURLGrfAtPos( const Point& rPt, OUString* pURL = nullptr, + OUString *pTargetFrameName = nullptr, + OUString *pURLDescription = nullptr ) const; /** For Chain always connect Fly specified by format with that hit by point. rRect contains rect of Fly (for its highlight). */ @@ -557,7 +557,7 @@ public: Return value indicates if it was converted. */ bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const; - void Paste( SvStream& rStm, SwPasteSdr nAction, const Point* pPt = 0 ); + void Paste( SvStream& rStm, SwPasteSdr nAction, const Point* pPt = nullptr ); bool Paste( const Graphic &rGrf, const OUString& rURL ); bool IsAlignPossible() const; @@ -565,22 +565,22 @@ public: void Insert(const OUString& rGrfName, const OUString& rFltName, - const Graphic* pGraphic = 0, - const SfxItemSet* pFlyAttrSet = 0, - const SfxItemSet* pGrfAttrSet = 0, - SwFrameFormat* = 0 ); + const Graphic* pGraphic = nullptr, + const SfxItemSet* pFlyAttrSet = nullptr, + const SfxItemSet* pGrfAttrSet = nullptr, + SwFrameFormat* = nullptr ); /// Insertion of a drawing object which have to be already inserted in the DrawModel. void InsertDrawObj( SdrObject& rDrawObj, const Point& rInsertPosition ); bool ReplaceSdrObj( const OUString& rGrfName, const OUString& rFltName, - const Graphic* pGrf = 0 ); + const Graphic* pGrf = nullptr ); // --> #i972# /** for starmath formulas anchored 'as char' it aligns it baseline to baseline changing the previous vertical orientation */ - void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 ); + void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = nullptr ); /// aligns all formulas with anchor 'as char' to baseline void AlignAllFormulasToBaseline(); @@ -602,7 +602,7 @@ public: size_t GetPageDescCnt() const; SwPageDesc* FindPageDescByName( const OUString& rName, bool bGetFromPool = false, - size_t* pPos = 0 ); + size_t* pPos = nullptr ); const SwPageDesc& GetPageDesc( size_t i ) const; void ChgPageDesc( size_t i, const SwPageDesc& ); @@ -611,7 +611,7 @@ public: const SwPageDesc* GetSelectedPageDescs() const; const SwRect& GetAnyCurRect( CurRectType eType, - const Point* pPt = 0, + const Point* pPt = nullptr, const css::uno::Reference < css::embed::XEmbeddedObject >& = css::uno::Reference < css::embed::XEmbeddedObject >() ) const; @@ -620,9 +620,9 @@ public: bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const; SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&, - const SfxItemSet* pFlyAttrSet = 0, - const SfxItemSet* pGrfAttrSet = 0, - SwFrameFormat* = 0 ); + const SfxItemSet* pFlyAttrSet = nullptr, + const SfxItemSet* pGrfAttrSet = nullptr, + SwFrameFormat* = nullptr ); bool FinishOLEObj(); ///< Shutdown server. void GetTableAttr( SfxItemSet & ) const; @@ -686,7 +686,7 @@ public: const Point &rPt ); /// pEnd will be used during MouseMove - bool SelTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); + bool SelTableRowCol( const Point& rPt, const Point* pEnd = nullptr, bool bRowDrag = false ); void GetTabRows( SwTabCols &rToFill ) const; void SetTabRows( const SwTabCols &rNew, bool bCurColOnly ); @@ -697,8 +697,8 @@ public: cursor is not allowed in readonly. */ void UnProtectCells(); ///< Refers to table selection. void UnProtectTables(); ///< Unprotect all tables in selection. - bool HasTableAnyProtection( const OUString* pTableName = 0, - bool* pFullTableProtection = 0 ); + bool HasTableAnyProtection( const OUString* pTableName = nullptr, + bool* pFullTableProtection = nullptr ); bool CanUnProtectCells() const; sal_uInt16 GetRowsToRepeat() const; @@ -749,12 +749,12 @@ public: const bool bCpyBrd = true ); /// The ruler needs some information too. - sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == not in any column. + sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = nullptr ) const; //0 == not in any column. sal_uInt16 GetCurMouseColNum( const Point &rPt, - SwGetCurColNumPara* pPara = 0 ) const; + SwGetCurColNumPara* pPara = nullptr ) const; size_t GetCurTabColNum() const; //0 == not in any table. size_t GetCurMouseTabColNum( const Point &rPt ) const; - sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; ///< Current outer column. + sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = nullptr ) const; ///< Current outer column. bool IsTableRightToLeft() const; bool IsMouseTableRightToLeft( const Point &rPt ) const; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 4363fb5bc036..603e7587b8ee 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -267,7 +267,7 @@ public: inline void SwFieldType::UpdateFields() const { - const_cast<SwFieldType*>(this)->ModifyNotification( 0, 0 ); + const_cast<SwFieldType*>(this)->ModifyNotification( nullptr, nullptr ); } /** Base class of all fields. diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index da2b091b1499..bd260372b1e8 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -52,12 +52,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index a76ff7e2f948..f72adf0a5411 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -44,12 +44,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx index f7ac3d18d561..4f74fdca1889 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -32,7 +32,7 @@ public: : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 336453555a38..ab3532b901ed 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -102,12 +102,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx index 3578bb794705..2fb7ee23177b 100644 --- a/sw/inc/fmtcnct.hxx +++ b/sw/inc/fmtcnct.hxx @@ -41,12 +41,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index d170da60c970..2403675f41fc 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -34,13 +34,13 @@ class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem SwFormatContent &operator=( const SwFormatContent & ) = delete; public: - SwFormatContent( const SwStartNode* pStartNode = 0 ); + SwFormatContent( const SwStartNode* pStartNode = nullptr ); SwFormatContent( const SwFormatContent &rCpy ); virtual ~SwFormatContent(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; const SwNodeIndex *GetContentIdx() const { return pStartNode; } void SetNewContentIdx( const SwNodeIndex *pIdx ); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 57d29ea4b714..7388af608a00 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -67,7 +67,7 @@ protected: SwTextFormatColl *mpNextTextFormatColl; SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, - SwTextFormatColl* pDerFrom = 0, + SwTextFormatColl* pDerFrom = nullptr, sal_uInt16 nFormatWh = RES_TXTFMTCOLL ) : SwFormatColl(rPool, pFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh) , mbStayAssignedToListLevelOfOutlineStyle(false) @@ -77,7 +77,7 @@ protected: } SwTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, - SwTextFormatColl* pDerFrom = 0, + SwTextFormatColl* pDerFrom = nullptr, sal_uInt16 nFormatWh = RES_TXTFMTCOLL ) : SwFormatColl(rPool, rFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh) , mbStayAssignedToListLevelOfOutlineStyle(false) @@ -141,13 +141,13 @@ class SwGrfFormatColl: public SwFormatColl friend class SwDoc; protected: SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, - SwGrfFormatColl* pDerFrom = 0 ) + SwGrfFormatColl* pDerFrom = nullptr ) : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange, pDerFrom, RES_GRFFMTCOLL ) {} SwGrfFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, - SwGrfFormatColl* pDerFrom = 0 ) + SwGrfFormatColl* pDerFrom = nullptr ) : SwFormatColl( rPool, rFormatCollName, aGrfFormatCollSetRange, pDerFrom, RES_GRFFMTCOLL ) {} @@ -223,11 +223,11 @@ protected: SwFormatCollConditions m_CondColls; SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, - SwTextFormatColl* pDerFrom = 0 ) + SwTextFormatColl* pDerFrom = nullptr ) : SwTextFormatColl( rPool, pFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL ) {} SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, - SwTextFormatColl* pDerFrom = 0 ) + SwTextFormatColl* pDerFrom = nullptr ) : SwTextFormatColl( rPool, rFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL ) {} diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx index e6b12d0ef61b..452db0350669 100644 --- a/sw/inc/fmtcolfunc.hxx +++ b/sw/inc/fmtcolfunc.hxx @@ -38,7 +38,7 @@ namespace TextFormatCollFunc */ void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( SwFormat* pFormat, - const SwNumRuleItem* pNewNumRuleItem = 0L ); + const SwNumRuleItem* pNewNumRuleItem = nullptr ); /** determines the list style, which directly set at the given paragraph style diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx index 8070ddf1f54b..cef3224b303a 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -33,12 +33,12 @@ public: bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} /// "pure virtual methos" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 7b678c0d47ea..06ad1f32f2ae 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -40,11 +40,11 @@ public: SwFormatFlyCnt( SwFrameFormat *pFrameFormat ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; inline SwFrameFormat *GetFrameFormat() const { return pFormat; } /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object. - inline void SetFlyFormat( SwFrameFormat* pNew = 0 ) { pFormat = pNew; } + inline void SetFlyFormat( SwFrameFormat* pNew = nullptr ) { pFormat = pNew; } const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; } }; diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 9204f15fad2c..0f83415293e8 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -69,7 +69,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override; @@ -130,7 +130,7 @@ class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint const SwView* pView; public: - SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const SwView* pV = 0) + SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const SwView* pV = nullptr) : pField(p) , nWhich(n) , pView(pV) diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index 0ce283f38984..a23e0f3e7501 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index 2389f6566275..d3416adf3998 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -40,7 +40,7 @@ public: inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() const override; SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx index 10e56dcf0c47..4f77040ed410 100644 --- a/sw/inc/fmtfsize.hxx +++ b/sw/inc/fmtfsize.hxx @@ -66,12 +66,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index a7025d32747d..96f53dcf7845 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -56,7 +56,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; // SwClient virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx index d9730b6de3b5..879c561d61bd 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -63,7 +63,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const override; + const IntlWrapper* pIntl = nullptr ) const override; inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); } @@ -91,7 +91,7 @@ public: : SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd @@ -103,7 +103,7 @@ public: SetNumType( SVX_NUM_ROMAN_LOWER ); } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 7434c1acb301..e0c9a513c081 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -46,12 +46,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } @@ -78,12 +78,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 528bad3ecf7d..aa6ca6f424e9 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -52,12 +52,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; @@ -123,7 +123,7 @@ public: } /// Set a new MacroTable or clear the current one. - void SetMacroTable( const SvxMacroTableDtor* pTable = 0 ); + void SetMacroTable( const SvxMacroTableDtor* pTable = nullptr ); const SvxMacroTableDtor* GetMacroTable() const { return mpMacroTable; diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index cde782f63717..7d81094d3c9a 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -39,12 +39,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx index 84dac2749389..112da9ba567c 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -32,12 +32,12 @@ public: SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {} /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; }; inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 8e2f92e448ba..ab1ac82ddefb 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -110,7 +110,7 @@ public: /// SfxPoolItem virtual bool operator==( const SfxPoolItem & ) const override; - virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem * Clone( SfxItemPool *pPool = nullptr ) const override; /// notify clients registered at m_pMeta that this meta is being (re-)moved void NotifyChangeTextNode(SwTextNode *const pTextNode); @@ -152,7 +152,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; public: - explicit Meta(SwFormatMeta * const i_pFormat = 0); + explicit Meta(SwFormatMeta * const i_pFormat = nullptr); virtual ~Meta(); /// sfx2::Metadatable @@ -179,7 +179,7 @@ private: bool IsFixedLanguage() const { return m_bIsFixedLanguage; } void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; } - explicit MetaField(SwFormatMeta * const i_pFormat = 0, + explicit MetaField(SwFormatMeta * const i_pFormat = nullptr, const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); @@ -200,7 +200,7 @@ private: public: MetaFieldManager(); std::shared_ptr<MetaField> makeMetaField( - SwFormatMeta * const i_pFormat = 0, + SwFormatMeta * const i_pFormat = nullptr, const sal_uInt32 nNumberFormat = SAL_MAX_UINT32, const bool bIsFixedLanguage = false ); /// get all meta fields diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 8c9ed10935cf..112d7fe343e2 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -43,12 +43,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; @@ -80,12 +80,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 5a0d12bd3b14..c07a2182b9ef 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -47,7 +47,7 @@ protected: virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) override; public: - SwFormatPageDesc( const SwPageDesc *pDesc = 0 ); + SwFormatPageDesc( const SwPageDesc *pDesc = nullptr ); SwFormatPageDesc( const SwFormatPageDesc &rCpy ); SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy ); virtual ~SwFormatPageDesc(); @@ -56,12 +56,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 6f6521926c24..1c1c578edec9 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -52,7 +52,7 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; // SwClient virtual void Modify(SfxPoolItem const* pOld, SfxPoolItem const* pNew) diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 5238a5f047c4..58c601461bbb 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -32,12 +32,12 @@ public: SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; }; inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 22b1d069f905..62f27043e5de 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -43,13 +43,13 @@ public: // "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 8aaa75aad533..b628a9408d21 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -40,13 +40,13 @@ public: // "Pure virtual Methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; virtual sal_uInt16 GetValueCount() 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; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index b29156c4c023..20eb332719fa 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -50,12 +50,12 @@ public: /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 0d72126413f2..d60d9c829c66 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -44,7 +44,7 @@ public: /// pure virtual methods of class <SfxPoolItem> virtual bool operator==( const SfxPoolItem& _rAttr ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 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/inc/format.hxx b/sw/inc/format.hxx index bff32bc663f3..fe0ddfd2ec55 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -89,7 +89,7 @@ public: void DelDiffs( const SwFormat& rFormat ) { DelDiffs( rFormat.GetAttrSet() ); } /// 0 is Default. - bool SetDerivedFrom(SwFormat *pDerivedFrom = 0); + bool SetDerivedFrom(SwFormat *pDerivedFrom = nullptr); /// If bInParents is FALSE, search only in this format for attribute. //UUUUinline @@ -97,7 +97,7 @@ public: bool bInParents = true ) const; //UUUUinline SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true, - const SfxPoolItem **ppItem = 0 ) const; + const SfxPoolItem **ppItem = nullptr ) const; SfxItemState GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent = true) const; virtual bool SetFormatAttr( const SfxPoolItem& rAttr ); @@ -109,7 +109,7 @@ public: virtual sal_uInt16 ResetAllFormatAttr(); inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } - inline bool IsDefault() const { return DerivedFrom() == 0; } + inline bool IsDefault() const { return DerivedFrom() == nullptr; } inline OUString GetName() const { return m_aFormatName; } inline bool HasName(const OUString &rName) const { return m_aFormatName == rName; } diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 69fa3047d407..3e881645a6f9 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -53,14 +53,14 @@ protected: const sal_Char* pFormatNm, SwFrameFormat *pDrvdFrm, sal_uInt16 nFormatWhich = RES_FRMFMT, - const sal_uInt16* pWhichRange = 0); + const sal_uInt16* pWhichRange = nullptr); SwFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrm, sal_uInt16 nFormatWhich = RES_FRMFMT, - const sal_uInt16* pWhichRange = 0); + const sal_uInt16* pWhichRange = nullptr); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override; @@ -81,13 +81,13 @@ public: rPoint - test on DocPosition. pFly - optional FlyFrame, in case it is already known. */ IMapObject* GetIMapObject( const Point& rPoint, - const SwFlyFrm *pFly = 0 ) const; + const SwFlyFrm *pFly = nullptr ) const; /** @return the real size of the frame - or an empty rectangle if no layout exists. If pPoint is given, look for the frame closest to it. */ SwRect FindLayoutRect( const bool bPrtArea = false, - const Point* pPoint = 0, + const Point* pPoint = nullptr, const bool bCalcFrm = false ) const; /** Searches SdrObject. SdrObjUserCall is client of the format. @@ -175,10 +175,10 @@ public: /// Creates the views. virtual void MakeFrms() override; - SwFlyFrm* GetFrm( const Point* pDocPos = 0, + SwFlyFrm* GetFrm( const Point* pDocPos = nullptr, const bool bCalcFrm = false ) const; - SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0, + SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = nullptr, const bool bCalcFrm = false ) const; virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override; diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index b79a57e72980..62396a5f369f 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -45,7 +45,7 @@ public: void UpdateFootnote( const SwNodeIndex& rStt ); // Update all from pos. void UpdateAllFootnote(); // Update all footnotes. - SwTextFootnote* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const; + SwTextFootnote* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = nullptr ) const; }; class SwUpdFootnoteEndNtAtEnd diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index ae6820ae6c79..76bdff5aa1e0 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -63,7 +63,7 @@ public: SwEndNoteInfo & operator=(const SwEndNoteInfo&); bool operator==( const SwEndNoteInfo &rInf ) const; - SwEndNoteInfo( SwTextFormatColl *pTextColl = 0); + SwEndNoteInfo( SwTextFormatColl *pTextColl = nullptr); SwEndNoteInfo(const SwEndNoteInfo&); const OUString& GetPrefix() const { return sPrefix; } @@ -100,7 +100,7 @@ public: bool operator==( const SwFootnoteInfo &rInf ) const; - SwFootnoteInfo(SwTextFormatColl* pTextColl = 0); + SwFootnoteInfo(SwTextFormatColl* pTextColl = nullptr); SwFootnoteInfo(const SwFootnoteInfo&); }; diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index ce8031a0f7ba..9b16b4b44c2c 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -52,7 +52,7 @@ public: {} // pure virtual methods of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const override; @@ -61,7 +61,7 @@ public: 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; @@ -88,7 +88,7 @@ public: sal_Int32 nTop, sal_Int32 nBottom ); // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SwRotationGrf : public SfxUInt16Item @@ -103,13 +103,13 @@ public: {} // pure virtual methods from SfxInt16Item - 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, @@ -126,12 +126,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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 SW_DLLPUBLIC SwContrastGrf : public SfxInt16Item @@ -142,12 +142,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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 SwChannelGrf : public SfxInt16Item @@ -163,7 +163,7 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const override; + const IntlWrapper* pIntl = nullptr ) const override; }; class SwChannelRGrf : public SwChannelGrf @@ -172,7 +172,7 @@ public: SwChannelRGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELR ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SwChannelGGrf : public SwChannelGrf { @@ -180,7 +180,7 @@ public: SwChannelGGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELG ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SwChannelBGrf : public SwChannelGrf { @@ -188,7 +188,7 @@ public: SwChannelBGrf( sal_Int16 nVal = 0 ) : SwChannelGrf( nVal, RES_GRFATR_CHANNELB ) {} - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; }; class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem @@ -210,13 +210,13 @@ public: } // pure virtual methods from SfxEnumItem - 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; @@ -235,12 +235,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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 SwTransparencyGrf : public SfxByteItem @@ -251,12 +251,12 @@ public: {} // pure virtual methods from SfxInt16Item - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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, @@ -271,7 +271,7 @@ public: {} // pure virtual methods of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; // pure virtual methods of SfxEnumItem virtual sal_uInt16 GetValueCount() const override; @@ -279,7 +279,7 @@ public: 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; diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 1a3b407cc068..3822ee3edd84 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -32,12 +32,12 @@ public: bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; }; inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 481993d409ce..751dd5daae53 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -43,7 +43,7 @@ public: // "Overhead" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; }; // SwPtrMsgPoolItem (old SwObjectDying!) diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 8c038a5df51b..2f6e98e42d79 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -300,7 +300,7 @@ public: bool HasColsOption() const { return m_bColsOption; } bool HasColTags() const { return m_bColTags; } - bool IsTopTable() const { return m_pSwTable != 0; } + bool IsTopTable() const { return m_pSwTable != nullptr; } void SetMustResize( bool bSet ) { m_bMustResize = bSet; } void SetMustNotResize( bool bSet ) { m_bMustNotResize = bSet; } @@ -358,7 +358,7 @@ inline void SwHTMLTableLayoutCell::SetProtected() nRowSpan = 1; nColSpan = 1; - pContents = 0; + pContents = nullptr; } inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin, diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index 09289a382e7e..d7b6fef945d6 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -123,7 +123,7 @@ protected: virtual void Update( SwIndex const & rPos, const sal_Int32 nChangeLen, const bool bNegative = false, const bool bDelete = false ); - bool HasAnyIndex() const { return 0 != m_pFirst; } + bool HasAnyIndex() const { return nullptr != m_pFirst; } public: SwIndexReg(); diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 84ee60fc1f2d..4e6614ebce43 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -85,7 +85,7 @@ public: /// find for an internal format name the corresponding filter entry SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const OUString& rFormat, - const SfxFilterContainer* pCnt = 0 ); + const SfxFilterContainer* pCnt = nullptr ); /** Detect for the given file which filter should be used. The filter name is returned. If no filter could be found, the name of the ASCII filter @@ -96,7 +96,7 @@ public: static bool IsValidStgFilter( const css::uno::Reference < css::embed::XStorage >& rStg, const SfxFilter& rFilter); static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, - rtl_TextEncoding *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false ); + rtl_TextEncoding *pCharSet=nullptr, bool *pSwap=nullptr, LineEnd *pLineEnd=nullptr, bool bEncodedFilter = false ); static const OUString GetSubStorageName( const SfxFilter& rFltr ); }; diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 68c5626caead..374c55bdc8d3 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -91,7 +91,7 @@ public: bool IsRestartEachPage() const { return bRestartEachPage; } void SetRestartEachPage( bool b ) { bRestartEachPage = b; } - bool HasCharFormat() const { return GetRegisteredIn() != 0; } + bool HasCharFormat() const { return GetRegisteredIn() != nullptr; } }; #endif diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index d8a5e0f685e0..04c61cea7bc1 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -43,8 +43,8 @@ extern void PageNumNotify( SwViewShell* pVwSh, enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END }; extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG ); -SW_DLLPUBLIC void StartProgress ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 ); -SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = 0 ); +SW_DLLPUBLIC void StartProgress ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = nullptr ); +SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = nullptr ); SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell ); void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell ); void RescheduleProgress( SwDocShell *pDocShell ); diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 4c47284b14db..1bb0de60f23c 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -58,7 +58,7 @@ private: typedef std::vector<std::unique_ptr<InsCaptionOpt>> InsCapOptArr; InsCapOptArr m_InsCapOptArr; public: - InsCaptionOpt* Find(const SwCapObjType eType, const SvGlobalName *pOleId = 0); + InsCaptionOpt* Find(const SwCapObjType eType, const SvGlobalName *pOleId = nullptr); void Insert(InsCaptionOpt* pObj); }; diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index c3c1f5030b7a..8850d62d1c3a 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -141,13 +141,13 @@ public: SwNodePtr operator[]( sal_uLong n ) const; // defined in node.hxx sal_uLong Count() const { return BigPtrArray::Count(); } - void ForEach( FnForEach_SwNodes fnForEach, void* pArgs = 0 ) + void ForEach( FnForEach_SwNodes fnForEach, void* pArgs = nullptr ) { ForEach( 0, BigPtrArray::Count(), fnForEach, pArgs ); } - void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach, void* pArgs = 0 ); + void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach, void* pArgs = nullptr ); void ForEach( const SwNodeIndex& rStart, const SwNodeIndex& rEnd, - FnForEach_SwNodes fnForEach, void* pArgs = 0 ); + FnForEach_SwNodes fnForEach, void* pArgs = nullptr ); /// A still empty section. SwNode& GetEndOfPostIts() const { return *m_pEndOfPostIts; } @@ -205,29 +205,29 @@ public: /// Implementations of "Make...Node" are in the given .cxx-files. SwTextNode *MakeTextNode( const SwNodeIndex & rWhere, SwTextFormatColl *pColl, - SwAttrSet* pAutoAttr = 0 ); ///< in ndtxt.cxx + SwAttrSet* pAutoAttr = nullptr ); ///< in ndtxt.cxx SwStartNode* MakeTextSection( const SwNodeIndex & rWhere, SwStartNodeType eSttNdTyp, SwTextFormatColl *pColl, - SwAttrSet* pAutoAttr = 0 ); + SwAttrSet* pAutoAttr = nullptr ); static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, SwGrfFormatColl *pColl, - SwAttrSet* pAutoAttr = 0, + SwAttrSet* pAutoAttr = nullptr, bool bDelayed = false ); ///< in ndgrf.cxx static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, SwGrfFormatColl *pColl, - SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx + SwAttrSet* pAutoAttr = nullptr ); ///< in ndgrf.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, const svt::EmbeddedObjectRef&, SwGrfFormatColl *pColl, - SwAttrSet* pAutoAttr = 0 ); ///< in ndole.cxx + SwAttrSet* pAutoAttr = nullptr ); ///< in ndole.cxx SwOLENode *MakeOLENode( const SwNodeIndex & rWhere, const OUString &rName, sal_Int64 nAspect, @@ -251,8 +251,8 @@ public: static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl, sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0, - SwTextFormatColl* pHeadlineTextColl = 0, - const SwAttrSet * pAttrSet = 0); + SwTextFormatColl* pHeadlineTextColl = nullptr, + const SwAttrSet * pAttrSet = nullptr); /// Create balanced table from selected range. SwTableNode* TextToTable( const SwNodeRange& rRange, sal_Unicode cCh, @@ -260,7 +260,7 @@ public: SwTableLineFormat* pLineFormat, SwTableBoxFormat* pBoxFormat, SwTextFormatColl* pTextColl, - SwUndoTextToTable* pUndo = 0 ); + SwUndoTextToTable* pUndo = nullptr ); static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange); @@ -274,7 +274,7 @@ public: /// Create regular text from what was table. bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, - SwUndoTableToText* = 0 ); + SwUndoTableToText* = nullptr ); /// Is in untbl.cxx and may called only by Undo-object. SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd, const SwTableToTextSaves& rSavedData ); @@ -296,7 +296,7 @@ public: bool bCalcNewSize = false ); /// Two Tables that are following one another are merged. bool MergeTable( const SwNodeIndex& rPos, bool bWithPrev = true, - sal_uInt16 nMode = 0, SwHistory* pHistory = 0 ); + sal_uInt16 nMode = 0, SwHistory* pHistory = nullptr ); /// Insert a new SwSection. SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx, @@ -316,7 +316,7 @@ public: with that before rFrmIdx and pEnd at the back. If no valid node is found, return 0. rFrmIdx points to the node with frames. **/ SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx, - const SwNode* pEnd = 0 ) const; + const SwNode* pEnd = nullptr ) const; SwNode * DocumentSectionStartNode(SwNode * pNode) const; SwNode * DocumentSectionEndNode(SwNode * pNode) const; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index ac02f976f068..d50e682c4b14 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -57,16 +57,16 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, SwGrfFormatColl* pGrfColl, - SwAttrSet* pAutoAttr = 0 ); + SwAttrSet* pAutoAttr = nullptr ); ///< Ctor for reading (SW/G) without graphics. SwGrfNode( const SwNodeIndex& rWhere, const OUString& rGrfName, const OUString& rFltName, SwGrfFormatColl* pGrfColl, - SwAttrSet* pAutoAttr = 0 ); + SwAttrSet* pAutoAttr = nullptr ); SwGrfNode( const SwNodeIndex& rWhere, const GraphicObject& rGrfObj, SwGrfFormatColl* pGrfColl, - SwAttrSet* pAutoAttr = 0 ); + SwAttrSet* pAutoAttr = nullptr ); void InsertLink( const OUString& rGrfName, const OUString& rFltName ); bool ImportGraphic( SvStream& rStrm ); @@ -127,8 +127,8 @@ public: void SetGraphic(const Graphic& rGraphic, const OUString& rLink); /// wrappers for non-const calls at GraphicObject - void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = NULL, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = NULL) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } - void StopGraphicAnimation(OutputDevice* pOut = NULL, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } + void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0, const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, OutputDevice* pFirstFrameOutDev = nullptr) { maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pAttr, nFlags, pFirstFrameOutDev); } + void StopGraphicAnimation(OutputDevice* pOut = nullptr, long nExtraData = 0) { maGrfObj.StopAnimation(pOut, nExtraData); } virtual Size GetTwipSize() const override; void SetTwipSize( const Size& rSz ); @@ -158,8 +158,8 @@ public: /** Re-read in case graphic was not OK. The current one gets replaced by the new one. */ bool ReRead( const OUString& rGrfName, const OUString& rFltName, - const Graphic* pGraphic = 0, - const GraphicObject* pGrfObj = 0, + const Graphic* pGraphic = nullptr, + const GraphicObject* pGrfObj = nullptr, bool bModify = true ); private: /// Loading of graphic immediately before displaying. @@ -205,12 +205,12 @@ public: // Inline methods from Node.hxx - it is only now that we know TextNode!! inline SwGrfNode *SwNode::GetGrfNode() { - return ND_GRFNODE == m_nNodeType ? static_cast<SwGrfNode*>(this) : 0; + return ND_GRFNODE == m_nNodeType ? static_cast<SwGrfNode*>(this) : nullptr; } inline const SwGrfNode *SwNode::GetGrfNode() const { - return ND_GRFNODE == m_nNodeType ? static_cast<const SwGrfNode*>(this) : 0; + return ND_GRFNODE == m_nNodeType ? static_cast<const SwGrfNode*>(this) : nullptr; } inline bool SwGrfNode::IsLinkedFile() const diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index 2d15a123eafc..c885be091460 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -45,7 +45,7 @@ SwTextAttr * MakeTextAttr( sal_Int32 const nStt, sal_Int32 const nEnd, CopyOrNew_t const bIsCopy = NEW, - SwTextNode *const pTextNode = 0 ); + SwTextNode *const pTextNode = nullptr ); SwTextAttr * MakeTextAttr( SwDoc & rDoc, @@ -172,7 +172,7 @@ public: /// register a History, which receives all attribute changes (for Undo) void Register( SwRegHistory* pHist ) { m_pHistory = pHist; } /// deregister the currently registered History - void DeRegister() { Register(0); } + void DeRegister() { Register(nullptr); } SwRegHistory* GetHistory() const { return m_pHistory; } /// try to insert the hint diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 722b874389b4..3c6b23439704 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwNoTextNode : public SwContentNode protected: SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, - SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = 0 ); + SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = nullptr ); public: virtual ~SwNoTextNode(); @@ -68,7 +68,7 @@ public: void SetContour( const tools::PolyPolygon *pPoly, bool bAutomatic = false ); const tools::PolyPolygon *HasContour() const; - bool _HasContour() const { return pContour!=0; }; + bool _HasContour() const { return pContour!=nullptr; }; void GetContour( tools::PolyPolygon &rPoly ) const; void CreateContour(); @@ -93,11 +93,11 @@ public: // Inline methods from Node.hxx - we know TextNode only here!! inline SwNoTextNode *SwNode::GetNoTextNode() { - return ND_NOTXTNODE & m_nNodeType ? static_cast<SwNoTextNode*>(this) : 0; + return ND_NOTXTNODE & m_nNodeType ? static_cast<SwNoTextNode*>(this) : nullptr; } inline const SwNoTextNode *SwNode::GetNoTextNode() const { - return ND_NOTXTNODE & m_nNodeType ? static_cast<const SwNoTextNode*>(this) : 0; + return ND_NOTXTNODE & m_nNodeType ? static_cast<const SwNoTextNode*>(this) : nullptr; } #endif // INCLUDED_SW_INC_NDNOTXT_HXX diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index d9776327bcb9..d5c78b7ae072 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -80,13 +80,13 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTextNode SwOLENode( const SwNodeIndex &rWhere, const svt::EmbeddedObjectRef&, SwGrfFormatColl *pGrfColl, - SwAttrSet* pAutoAttr = 0 ); + SwAttrSet* pAutoAttr = nullptr ); SwOLENode( const SwNodeIndex &rWhere, const OUString &rName, sal_Int64 nAspect, SwGrfFormatColl *pGrfColl, - SwAttrSet* pAutoAttr = 0 ); + SwAttrSet* pAutoAttr = nullptr ); SwOLENode( const SwOLENode & ) = delete; @@ -140,12 +140,12 @@ public: /// Inline methods from Node.hxx inline SwOLENode *SwNode::GetOLENode() { - return ND_OLENODE == m_nNodeType ? static_cast<SwOLENode*>(this) : 0; + return ND_OLENODE == m_nNodeType ? static_cast<SwOLENode*>(this) : nullptr; } inline const SwOLENode *SwNode::GetOLENode() const { - return ND_OLENODE == m_nNodeType ? static_cast<const SwOLENode*>(this) : 0; + return ND_OLENODE == m_nNodeType ? static_cast<const SwOLENode*>(this) : nullptr; } #endif // _ INCLUDED_SW_INC_NDOLE_HXX diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 285f3d01c14f..24a6bea2a96a 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -118,7 +118,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes; SAL_DLLPRIVATE SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl, - const SfxItemSet* pAutoAttr = 0 ); + const SfxItemSet* pAutoAttr = nullptr ); /// Copies the attributes at nStart to pDest. SAL_DLLPRIVATE void CopyAttr( SwTextNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos); @@ -234,7 +234,7 @@ public: /// Is in itratr. void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs, - OutputDevice* pOut = 0 ) const; + OutputDevice* pOut = nullptr ) const; /// overriding to handle change of certain paragraph attributes virtual bool SetAttr( const SfxPoolItem& ) override; @@ -276,7 +276,7 @@ public: const SwIndex &rIdx, const sal_Int32 nLen, const sal_uInt16 nWhich = 0, - const SfxItemSet* pSet = 0, + const SfxItemSet* pSet = nullptr, const bool bInclRefToxMark = false, const bool bExactRange = false ); void GCAttr(); @@ -690,7 +690,7 @@ public: const bool bAddSpaceAfterListLabelStr = false, const bool bWithSpacesForLevel = false, const bool bWithFootnote = true ) const; - bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = 0, + bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = nullptr, sal_Int32 nIdx = 0, sal_Int32 nLen = -1, bool bWithNum = false, bool bWithFootnote = true, bool bReplaceTabsWithSpaces = false ) const; @@ -749,7 +749,7 @@ public: /// change text to Upper/Lower/Hiragana/Katagana/... void TransliterateText( utl::TransliterationWrapper& rTrans, sal_Int32 nStart, sal_Int32 nEnd, - SwUndoTransliterate* pUndo = 0 ); + SwUndoTransliterate* pUndo = nullptr ); /// count words in given range - returns true if we refreshed out count bool CountWords( SwDocStat& rStat, sal_Int32 nStart, sal_Int32 nEnd ) const; @@ -848,12 +848,12 @@ inline SwTextFormatColl* SwTextNode::GetTextColl() const /// Inline methods from Node.hxx inline SwTextNode *SwNode::GetTextNode() { - return ND_TEXTNODE == m_nNodeType ? static_cast<SwTextNode*>(this) : 0; + return ND_TEXTNODE == m_nNodeType ? static_cast<SwTextNode*>(this) : nullptr; } inline const SwTextNode *SwNode::GetTextNode() const { - return ND_TEXTNODE == m_nNodeType ? static_cast<const SwTextNode*>(this) : 0; + return ND_TEXTNODE == m_nNodeType ? static_cast<const SwTextNode*>(this) : nullptr; } inline void diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 66a62506f2df..b7e973fb321a 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -257,7 +257,7 @@ public: IDocumentListItems& getIDocumentListItems(); /// Is node in the visible area of the Shell? - bool IsInVisibleArea( SwViewShell const * pSh = 0 ) const; + bool IsInVisibleArea( SwViewShell const * pSh = nullptr ) const; /// Is node in an protected area? bool IsInProtectSect() const; /** Is node in something that is protected (range, frame, @@ -267,7 +267,7 @@ public: /** Search PageDesc with which this node is formatted. If layout is existent search over layout, else only the hard way is left: search over the nodes to the front!! */ - const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = 0 ) const; + const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = nullptr ) const; /// If node is in a fly return the respective format. SwFrameFormat* GetFlyFormat() const; @@ -391,8 +391,8 @@ public: virtual SwContentNode *JoinPrev(); /** Is it possible to join two nodes? In pIdx the second position can be returned. */ - bool CanJoinNext( SwNodeIndex* pIdx =0 ) const; - bool CanJoinPrev( SwNodeIndex* pIdx =0 ) const; + bool CanJoinNext( SwNodeIndex* pIdx =nullptr ) const; + bool CanJoinPrev( SwNodeIndex* pIdx =nullptr ) const; void MakeStartIndex( SwIndex * pIdx ) { pIdx->Assign( this, 0 ); } void MakeEndIndex( SwIndex * pIdx ) { pIdx->Assign( this, Len() ); } @@ -402,16 +402,16 @@ public: /// Replacement for good old GetFrm(..): SwContentFrm *getLayoutFrm( const SwRootFrm*, - const Point* pDocPos = 0, - const SwPosition *pPos = 0, + const Point* pDocPos = nullptr, + const SwPosition *pPos = nullptr, const bool bCalcFrm = true ) const; /** @return the real size of the frame or an empty rectangle if no layout exists. Needed for export filters. */ SwRect FindLayoutRect( const bool bPrtArea = false, - const Point* pPoint = 0, + const Point* pPoint = nullptr, const bool bCalcFrm = false ) const; SwRect FindPageFrmRect( const bool bPrtArea = false, - const Point* pPoint = 0, + const Point* pPoint = nullptr, const bool bCalcFrm = false ) const; /** Method creates all views of document for given node. The content @@ -554,7 +554,7 @@ public: On default the frames are created until the end of the range. When another NodeIndex pEnd is passed a MakeFrms is called up to it. Used by TableToText. */ - void MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEnd = NULL ); + void MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEnd = nullptr ); /** Method deletes all views of document for the node. The content frames are removed from the respective layout. */ @@ -589,43 +589,43 @@ private: inline SwEndNode *SwNode::GetEndNode() { - return ND_ENDNODE == m_nNodeType ? static_cast<SwEndNode*>(this) : 0; + return ND_ENDNODE == m_nNodeType ? static_cast<SwEndNode*>(this) : nullptr; } inline const SwEndNode *SwNode::GetEndNode() const { - return ND_ENDNODE == m_nNodeType ? static_cast<const SwEndNode*>(this) : 0; + return ND_ENDNODE == m_nNodeType ? static_cast<const SwEndNode*>(this) : nullptr; } inline SwStartNode *SwNode::GetStartNode() { - return ND_STARTNODE & m_nNodeType ? static_cast<SwStartNode*>(this) : 0; + return ND_STARTNODE & m_nNodeType ? static_cast<SwStartNode*>(this) : nullptr; } inline const SwStartNode *SwNode::GetStartNode() const { - return ND_STARTNODE & m_nNodeType ? static_cast<const SwStartNode*>(this) : 0; + return ND_STARTNODE & m_nNodeType ? static_cast<const SwStartNode*>(this) : nullptr; } inline SwTableNode *SwNode::GetTableNode() { - return ND_TABLENODE == m_nNodeType ? static_cast<SwTableNode*>(this) : 0; + return ND_TABLENODE == m_nNodeType ? static_cast<SwTableNode*>(this) : nullptr; } inline const SwTableNode *SwNode::GetTableNode() const { - return ND_TABLENODE == m_nNodeType ? static_cast<const SwTableNode*>(this) : 0; + return ND_TABLENODE == m_nNodeType ? static_cast<const SwTableNode*>(this) : nullptr; } inline SwSectionNode *SwNode::GetSectionNode() { - return ND_SECTIONNODE == m_nNodeType ? static_cast<SwSectionNode*>(this) : 0; + return ND_SECTIONNODE == m_nNodeType ? static_cast<SwSectionNode*>(this) : nullptr; } inline const SwSectionNode *SwNode::GetSectionNode() const { - return ND_SECTIONNODE == m_nNodeType ? static_cast<const SwSectionNode*>(this) : 0; + return ND_SECTIONNODE == m_nNodeType ? static_cast<const SwSectionNode*>(this) : nullptr; } inline SwContentNode *SwNode::GetContentNode() { - return ND_CONTENTNODE & m_nNodeType ? static_cast<SwContentNode*>(this) : 0; + return ND_CONTENTNODE & m_nNodeType ? static_cast<SwContentNode*>(this) : nullptr; } inline const SwContentNode *SwNode::GetContentNode() const { - return ND_CONTENTNODE & m_nNodeType ? static_cast<const SwContentNode*>(this) : 0; + return ND_CONTENTNODE & m_nNodeType ? static_cast<const SwContentNode*>(this) : nullptr; } inline bool SwNode::IsStartNode() const @@ -717,7 +717,7 @@ inline const SwDoc* SwNode::GetDoc() const inline SwFormatColl* SwContentNode::GetCondFormatColl() const { - return m_pCondColl ? static_cast<SwFormatColl*>(m_pCondColl->GetRegisteredIn()) : 0; + return m_pCondColl ? static_cast<SwFormatColl*>(m_pCondColl->GetRegisteredIn()) : nullptr; } inline SwFormatColl& SwContentNode::GetAnyFormatColl() const diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index ace92d0bcb4e..e07e7128917b 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -82,7 +82,7 @@ public: void SetGrfBulletCP(sal_Unicode cP){m_cGrfBulletCP = cP;} sal_Unicode GetGrfBulletCP() const {return m_cGrfBulletCP;} - virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0) override; + virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = nullptr, const sal_Int16* pOrient = nullptr) override; virtual void SetVertOrient(sal_Int16 eSet) override; virtual sal_Int16 GetVertOrient() const override; @@ -173,7 +173,7 @@ public: const bool bInclStrings = true, const bool bOnlyArabic = false, const unsigned int _nRestrictToThisLevel = MAXLEVEL, - Extremities* pExtremities = 0 ) const; + Extremities* pExtremities = nullptr ) const; OUString MakeRefNumString( const SwNodeNum& rNodeNum, const bool bInclSuperiorNumLabels = false, const sal_uInt8 nRestrictInclToThisLevel = 0 ) const; diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 8a6c3d555f08..01d32fb21bd1 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -164,23 +164,23 @@ class SW_DLLPUBLIC SwPaM : public sw::Ring<SwPaM> SwPosition * m_pMark; ///< points at either m_Bound1 or m_Bound2 bool m_bIsInFrontOfLabel; - SwPaM* MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg = 0 ); + SwPaM* MakeRegion( SwMoveFn fnMove, const SwPaM * pOrigRg = nullptr ); SwPaM(SwPaM const& rPaM) = delete; public: - explicit SwPaM( const SwPosition& rPos, SwPaM* pRing = 0 ); - SwPaM( const SwPosition& rMk, const SwPosition& rPt, SwPaM* pRing = 0 ); + explicit SwPaM( const SwPosition& rPos, SwPaM* pRing = nullptr ); + SwPaM( const SwPosition& rMk, const SwPosition& rPt, SwPaM* pRing = nullptr ); SwPaM( const SwNodeIndex& rMk, const SwNodeIndex& rPt, - long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 ); + long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = nullptr ); SwPaM( const SwNode& rMk, const SwNode& rPt, - long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 ); + long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = nullptr ); SwPaM( const SwNodeIndex& rMk, sal_Int32 nMkContent, - const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 ); + const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing = nullptr ); SwPaM( const SwNode& rMk, sal_Int32 nMkContent, - const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 ); - SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 ); - SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 ); + const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = nullptr ); + SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = nullptr ); + SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = nullptr ); virtual ~SwPaM(); /// this takes a second parameter, which indicates the Ring that @@ -198,13 +198,13 @@ public: bool bSearchInNotes, utl::TextSearch& rSText, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, bool bInReadOnly = false); + const SwPaM *pPam =nullptr, bool bInReadOnly = false); bool Find( const SwFormat& rFormat, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, bool bInReadOnly = false); + const SwPaM *pPam =nullptr, bool bInReadOnly = false); bool Find( const SfxPoolItem& rAttr, bool bValue = true, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, bool bInReadOnly = false ); + const SwPaM *pPam =nullptr, bool bInReadOnly = false ); bool Find( const SfxItemSet& rAttr, bool bNoColls, SwMoveFn fnMove, const SwPaM *pPam, bool bInReadOnly, bool bMoveFirst ); @@ -293,7 +293,7 @@ public: { return bOne ? m_Bound1 : m_Bound2; } /// Get number of page which contains cursor. - sal_uInt16 GetPageNum( bool bAtPoint = true, const Point* pLayPos = 0 ); + sal_uInt16 GetPageNum( bool bAtPoint = true, const Point* pLayPos = nullptr ); /** Is in something protected (readonly) or selection contains something protected. */ diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 46c8267296c0..2fa8fbc52153 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -77,12 +77,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; @@ -121,12 +121,12 @@ public: inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; }; inline SwRegisterItem::SwRegisterItem( const bool bRegister ) : @@ -159,12 +159,12 @@ public: /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; @@ -183,12 +183,12 @@ public: inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); /// "pure virtual methods" of SfxPoolItem - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) 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; }; inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) : diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index dd3e4b45014b..554e5ebc6a43 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -57,7 +57,7 @@ struct SwLayoutInfo sal_uInt16 mRedlineAuthor; SwLayoutInfo() - : mpAnchorFrm(0) + : mpAnchorFrm(nullptr) , mPosition() , mnStartNodeIdx( 0 ) , mnStartContent( -1 ) @@ -79,7 +79,7 @@ namespace SwPostItHelper SwLayoutStatus getLayoutInfos( SwLayoutInfo& o_rInfo, const SwPosition& rAnchorPos, - const SwPosition* pAnnotationStartPos = NULL ); + const SwPosition* pAnnotationStartPos = nullptr ); long getLayoutHeight( const SwRootFrm* pRoot ); void setSidebarChanged( SwRootFrm* pRoot, bool bBrowseMode ); @@ -98,7 +98,7 @@ public: SwSidebarItem( const bool aShow, const bool aFocus) - : pPostIt(0) + : pPostIt(nullptr) , bShow(aShow) , bFocus(aFocus) , mLayoutStatus( SwPostItHelper::INVISIBLE ) diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 5a074e091a4b..adac3de94ac2 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -80,8 +80,8 @@ public: SwPrintData() { - m_pPrintUIOptions = NULL; - m_pRenderData = NULL; + m_pPrintUIOptions = nullptr; + m_pRenderData = nullptr; bPrintGraphic = bPrintTable = @@ -251,21 +251,21 @@ public: SwRenderData(); ~SwRenderData(); - bool HasPostItData() const { return m_pPostItShell != 0; } + bool HasPostItData() const { return m_pPostItShell != nullptr; } void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ); void DeletePostItData(); SfxObjectShellLock const& GetTempDocShell() const { return m_xTempDocShell;} void SetTempDocShell(SfxObjectShellLock const&); - bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; } + bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != nullptr; } bool NeedNewViewOptionAdjust( const SwViewShell& ) const; void ViewOptionAdjustStart( SwViewShell &rSh, const SwViewOption &rViewOptions); void ViewOptionAdjust( SwPrintData const* const pPrtOptions ); void ViewOptionAdjustStop(); void ViewOptionAdjustCrashPreventionKludge(); - bool HasSwPrtOptions() const { return m_pPrtOptions != 0; } + bool HasSwPrtOptions() const { return m_pPrtOptions != nullptr; } SwPrintData const* GetSwPrtOptions() const { return m_pPrtOptions.get(); } void MakeSwPrtOptions( SwDocShell const*const pDocShell, SwPrintUIOptions const*const pOpt, bool const bIsPDFExport ); diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 9aa157e0c93c..72d590928201 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -57,7 +57,7 @@ class SwRedlineExtraData_FormatColl : public SwRedlineExtraData sal_uInt16 nPoolId; public: SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId, - const SfxItemSet* pSet = 0 ); + const SfxItemSet* pSet = nullptr ); virtual ~SwRedlineExtraData_FormatColl(); virtual SwRedlineExtraData* CreateNew() const override; virtual void Reject( SwPaM& rPam ) const override; @@ -121,7 +121,7 @@ public: // For sw3io: pNext/pExtraData are taken over. SwRedlineData( RedlineType_t eT, sal_uInt16 nAut, const DateTime& rDT, const OUString& rCmnt, SwRedlineData* pNxt, - SwRedlineExtraData* pExtraData = 0 ); + SwRedlineExtraData* pExtraData = nullptr ); ~SwRedlineData(); @@ -200,7 +200,7 @@ public: // For sw3io: pData is taken over! SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, bool bVsbl, bool bDelLP, bool bIsPD) : - SwPaM( rPos ), pRedlineData( pData ), pContentSect( 0 ), + SwPaM( rPos ), pRedlineData( pData ), pContentSect( nullptr ), bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl ) {} SwRangeRedline( const SwRangeRedline& ); @@ -213,12 +213,12 @@ public: bool IsVisible() const { return bIsVisible; } bool IsDelLastPara() const { return bDelLastPara; } - void SetStart( const SwPosition& rPos, SwPosition* pSttPtr = 0 ) + void SetStart( const SwPosition& rPos, SwPosition* pSttPtr = nullptr ) { if( !pSttPtr ) pSttPtr = Start(); *pSttPtr = rPos; } - void SetEnd( const SwPosition& rPos, SwPosition* pEndPtr = 0 ) + void SetEnd( const SwPosition& rPos, SwPosition* pEndPtr = nullptr ) { if( !pEndPtr ) pEndPtr = End(); *pEndPtr = rPos; diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 4ed183749aae..010e08a82dec 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -76,7 +76,7 @@ public: static SwTextNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark, sal_uInt16 nSubType, sal_uInt16 nSeqNo, - sal_Int32* pStt, sal_Int32* pEnd = 0 ); + sal_Int32* pStt, sal_Int32* pEnd = nullptr ); }; class SW_DLLPUBLIC SwGetRefField : public SwField diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index a07dd06382a6..f3581ce9968b 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -116,7 +116,7 @@ public: void SetCondition(OUString const& rNew) { m_sCondition = rNew; } OUString GetLinkFileName() const { return m_sLinkFileName; } - void SetLinkFileName(OUString const& rNew, OUString const* pPassWd = 0) + void SetLinkFileName(OUString const& rNew, OUString const* pPassWd = nullptr) { m_sLinkFileName = rNew; if (pPassWd) { SetLinkFilePassword(*pPassWd); } @@ -203,7 +203,7 @@ public: void SetCondition(OUString const& rNew) { m_Data.SetCondition(rNew); } OUString GetLinkFileName() const; - void SetLinkFileName(OUString const& rNew, OUString const*const pPassWd = 0); + void SetLinkFileName(OUString const& rNew, OUString const*const pPassWd = nullptr); // Password of linked file (only valid during runtime!) OUString GetLinkFilePassword() const { return m_Data.GetLinkFilePassword(); } @@ -354,7 +354,7 @@ SwSectionFormat const * SwSection::GetFormat() const inline SwSection* SwSection::GetParent() const { SwSectionFormat const * pFormat = GetFormat(); - SwSection* pRet = 0; + SwSection* pRet = nullptr; if( pFormat ) pRet = pFormat->GetParentSection(); return pRet; @@ -362,7 +362,7 @@ inline SwSection* SwSection::GetParent() const inline SwSectionFormat* SwSectionFormat::GetParent() const { - SwSectionFormat* pRet = 0; + SwSectionFormat* pRet = nullptr; if( GetRegisteredIn() ) pRet = const_cast<SwSectionFormat*>(dynamic_cast< const SwSectionFormat* >( GetRegisteredIn() )); return pRet; @@ -371,7 +371,7 @@ inline SwSectionFormat* SwSectionFormat::GetParent() const inline SwSection* SwSectionFormat::GetParentSection() const { SwSectionFormat* pParent = GetParent(); - SwSection* pRet = 0; + SwSection* pRet = nullptr; if( pParent ) { pRet = pParent->GetSection(); diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 9e8938eee4e9..9b8c94ea8304 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -161,7 +161,7 @@ public: // Initial reading. Document is created only at Read(...) // or in case it is given, into that. // Special case for Load with Sw3Reader. - SwReader( SfxMedium&, const OUString& rFilename, SwDoc *pDoc = 0 ); + SwReader( SfxMedium&, const OUString& rFilename, SwDoc *pDoc = nullptr ); // Read into existing document. // Document and position in document are taken from SwPaM. @@ -412,10 +412,10 @@ public: Writer(); virtual ~Writer(); - virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = 0 ); - sal_uLong Write( SwPaM&, SvStream&, const OUString* = 0 ); - virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ); - virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* = nullptr ); + sal_uLong Write( SwPaM&, SvStream&, const OUString* = nullptr ); + virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = nullptr, SfxMedium* = nullptr ); + virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = nullptr ); virtual void SetupFilterOptions(SfxMedium& rMedium); @@ -476,8 +476,8 @@ public: virtual bool IsStgWriter() const override; - virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = 0, SfxMedium* = 0 ) override; - virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = 0 ) override; + virtual sal_uLong Write( SwPaM&, const css::uno::Reference < css::embed::XStorage >&, const OUString* = nullptr, SfxMedium* = nullptr ) override; + virtual sal_uLong Write( SwPaM&, SotStorage&, const OUString* = nullptr ) override; SotStorage& GetStorage() const { return *pStg; } }; @@ -498,7 +498,7 @@ class SW_DLLPUBLIC SwWriter bool bWriteAll; public: - sal_uLong Write( WriterRef& rxWriter, const OUString* = 0); + sal_uLong Write( WriterRef& rxWriter, const OUString* = nullptr); SwWriter( SvStream&, SwCrsrShell &, bool bWriteAll = false ); SwWriter( SvStream&, SwDoc & ); @@ -523,7 +523,7 @@ struct SwReaderWriterEntry bool bDelReader; SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, bool bDel ) - : pReader( NULL ), fnGetReader( fnReader ), fnGetWriter( fnWriter ), bDelReader( bDel ) + : pReader( nullptr ), fnGetReader( fnReader ), fnGetWriter( fnWriter ), bDelReader( bDel ) {} /// Get access to the reader. diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index f0fc06f3638e..dd1e736fe954 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -77,7 +77,7 @@ struct SwConversionArgs : SwArgsBase nConvSrcLang( nLang ), nConvTextLang( LANGUAGE_NONE ), nConvTargetLang( LANGUAGE_NONE ), - pTargetFont( NULL ), + pTargetFont( nullptr ), bAllowImplicitChangesForNotConvertibleText( false ) {} }; @@ -137,7 +137,7 @@ public: } const Point *GetCrsrPos() const { - return aCrsrPos.X() || aCrsrPos.Y() ? &aCrsrPos : 0; + return aCrsrPos.X() || aCrsrPos.Y() ? &aCrsrPos : nullptr; } bool IsCheck() const { return bCheck; } void SetCheck( const bool bNew ) { bCheck = bNew; } diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 4e2064c36a57..8919596a8198 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -337,7 +337,7 @@ public: virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0; virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, - sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) = 0; + sal_uInt8 nDialogMode, const OUString* pFormatStr = nullptr) = 0; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0; @@ -360,7 +360,7 @@ public: SwView& rVw, const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, - const OUString *pCollName = 0, + const OUString *pCollName = nullptr, bool bDraw = false, const OString& sDefPage = OString() ) = 0; @@ -371,7 +371,7 @@ public: virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell, bool bSetAutoFormat = true, - const SwTableAutoFormat* pSelFormat = 0 ) = 0; + const SwTableAutoFormat* pSelFormat = nullptr ) = 0; virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0; virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0; @@ -393,7 +393,7 @@ public: bool bNewFrm = true, bool bFormat = false, const OString& sDefPage = OString(), - const OUString* pFormatStr = 0) = 0; + const OUString* pFormatStr = nullptr) = 0; /// @param nSlot /// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered. /// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane @@ -402,7 +402,7 @@ public: SfxStyleSheetBase& rBase, sal_uInt16 nRegion, const OString& sPage = OString(), - SwWrtShell* pActShell = 0, + SwWrtShell* pActShell = nullptr, bool bNew = false) = 0; virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, @@ -422,7 +422,7 @@ public: const OUString& rTableName, sal_Int32 nCommandType, const css::uno::Reference< css::sdbc::XConnection>& xConnection, - css::uno::Sequence< css::uno::Any >* pSelection = 0 ) = 0; + css::uno::Sequence< css::uno::Any >* pSelection = nullptr ) = 0; virtual AbstractMailMergeCreateFromDlg* CreateMailMergeCreateFromDlg(vcl::Window* pParent) = 0; virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(vcl::Window* pParent) = 0; virtual VclAbstractDialog* CreateMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr &rTOXMgr) = 0; diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 72f01e7c335e..a0d08f2a20c2 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -184,7 +184,7 @@ public: SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable ); SwAttrSet( const SwAttrSet& ); - virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = 0) const override; + virtual SfxItemSet* Clone(bool bItems = true, SfxItemPool *pToPool = nullptr) const override; bool Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew ); bool Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); @@ -192,7 +192,7 @@ public: // Delete an item or a range. sal_uInt16 ClearItem_BC( sal_uInt16 nWhich, SwAttrSet* pOld, SwAttrSet* pNew ); sal_uInt16 ClearItem_BC( sal_uInt16 nWhich1, sal_uInt16 nWhich2, - SwAttrSet* pOld = 0, SwAttrSet* pNew = 0 ); + SwAttrSet* pOld = nullptr, SwAttrSet* pNew = nullptr ); int Intersect_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index 6660a2dd17e2..602c5919af06 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -37,7 +37,7 @@ protected: public: TYPEINFO_OVERRIDE(); - SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 ) + SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = nullptr ) : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ), bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ) {} @@ -53,7 +53,7 @@ public: // For graphics only. bool SwapIn( bool bWaitForData = false, bool bNativFormat = false ); - bool Connect() { return 0 != SvBaseLink::GetRealObject(); } + bool Connect() { return nullptr != SvBaseLink::GetRealObject(); } // Only for graphics-links (for switching between DDE / Grf-link). void SetObjType( sal_uInt16 nType ) { SvBaseLink::SetObjType( nType ); } diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index 012acef8a8db..08b217e095fc 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -94,10 +94,10 @@ public: public: - virtual SwCursor* Create( SwPaM* pRing = 0 ) const; + virtual SwCursor* Create( SwPaM* pRing = nullptr ) const; virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ); + virtual void SaveTableBoxContent( const SwPosition* pPos = nullptr ); void FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const; SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions, @@ -113,13 +113,13 @@ public: SwDocPositions nStart, SwDocPositions nEnde, bool& bCancel, FindRanges = FND_IN_BODY, - const SwTextFormatColl* pReplFormat = 0 ); + const SwTextFormatColl* pReplFormat = nullptr ); sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections, SwDocPositions nStart, SwDocPositions nEnde, bool& bCancel, FindRanges = FND_IN_BODY, - const css::util::SearchOptions* pSearchOpt = 0, - const SfxItemSet* rReplSet = 0 ); + const css::util::SearchOptions* pSearchOpt = nullptr, + const SfxItemSet* rReplSet = nullptr ); // UI versions bool IsStartWord( sal_Int16 nWordType = css::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; @@ -130,7 +130,7 @@ public: bool GoEndWord(); bool GoNextWord(); bool GoPrevWord(); - bool SelectWord( SwViewShell* pViewShell, const Point* pPt = 0 ); + bool SelectWord( SwViewShell* pViewShell, const Point* pPt = nullptr ); // API versions of above functions (will be used with a different // WordType for the break iterator) @@ -141,7 +141,7 @@ public: bool GoEndWordWT( sal_Int16 nWordType ); bool GoNextWordWT( sal_Int16 nWordType ); bool GoPrevWordWT( sal_Int16 nWordType ); - bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 ); + bool SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = nullptr ); enum SentenceMoveType { @@ -242,7 +242,7 @@ struct _SwCursor_SavePos _SwCursor_SavePos( const SwCursor& rCrsr ) : nNode( rCrsr.GetPoint()->nNode.GetIndex() ), nContent( rCrsr.GetPoint()->nContent.GetIndex() ), - pNext( 0 ) + pNext( nullptr ) {} virtual ~_SwCursor_SavePos() {} @@ -264,7 +264,7 @@ protected: virtual bool IsSelOvrCheck(int eFlags) override; public: - SwTableCursor( const SwPosition &rPos, SwPaM* pRing = 0 ); + SwTableCursor( const SwPosition &rPos, SwPaM* pRing = nullptr ); SwTableCursor( SwTableCursor& ); virtual ~SwTableCursor(); diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index e2ca9302d2fd..567928739b1d 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -88,16 +88,16 @@ struct SwCallMouseEvent SwCallMouseEvent() : eType( EVENT_OBJECT_NONE ) - { PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; } + { PTR.pFormat = nullptr; PTR.IMAP.pIMapObj = nullptr; } void Set( SwCallEventObjectType eTyp, const SwFrameFormat* pFormat ) - { eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = 0; } + { eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = nullptr; } void Set( const SwFrameFormat* pFormat, const IMapObject* pIMapObj ) { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = pIMapObj; } void Set( const SwFormatINetFormat* pINetAttr ) - { eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; PTR.IMAP.pIMapObj = 0; } + { eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; PTR.IMAP.pIMapObj = nullptr; } bool operator==( const SwCallMouseEvent& rEvent ) const { @@ -109,7 +109,7 @@ struct SwCallMouseEvent { return !( *this == rEvent ); } void Clear() - { eType = EVENT_OBJECT_NONE; PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; } + { eType = EVENT_OBJECT_NONE; PTR.pFormat = nullptr; PTR.IMAP.pIMapObj = nullptr; } bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } }; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index a30a466f69fe..ee21c78430ef 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -221,7 +221,7 @@ public: // It's not allowed to change the table model after the first call of one of these functions. bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, - SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = 0 ) + SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = nullptr ) { #ifdef DBG_UTIL m_bDontChangeModel = true; @@ -253,7 +253,7 @@ public: bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) - { _FindSuperfluousRows( rBoxes, 0, 0 ); } + { _FindSuperfluousRows( rBoxes, nullptr, nullptr ); } void CheckRowSpan( SwTableLine* &rpLine, bool bUp ) const; SwTableSortBoxes& GetTabSortBoxes() { return m_TabSortContentBoxes; } @@ -279,9 +279,9 @@ public: bool bCpyNds = true, bool bCpyName = false ) const; // Copy table in this bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&, - SwUndoTableCpyTable* pUndo = 0 ); + SwUndoTableCpyTable* pUndo = nullptr ); bool InsTable( const SwTable& rCpyTable, const SwSelBoxes&, - SwUndoTableCpyTable* pUndo = 0 ); + SwUndoTableCpyTable* pUndo = nullptr ); bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&, SwUndoTableCpyTable* pUndo ); // Copy headline of table (with content!) into an other one. @@ -350,7 +350,7 @@ class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat. public: TYPEINFO_OVERRIDE(); - SwTableLine() : m_pUpper(0) {} + SwTableLine() : m_pUpper(nullptr) {} SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp ); virtual ~SwTableLine(); @@ -370,9 +370,9 @@ public: void ChgFrameFormat( SwTableLineFormat* pNewFormat ); // Search next/previous box with content. - SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, + SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =nullptr, bool bOvrTableLns=true ) const; - SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, + SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr, bool bOvrTableLns=true ) const; SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const; @@ -412,9 +412,9 @@ public: SwTableBox(); - SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = 0 ); - SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = 0 ); - SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = 0 ); + SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = nullptr ); + SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = nullptr ); + SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = nullptr ); virtual ~SwTableBox(); SwTableLines &GetTabLines() { return m_aLines; } @@ -442,9 +442,9 @@ public: sal_uLong GetSttIdx() const; // Search next/previous box with content. - SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, + SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =nullptr, bool bOvrTableLns=true ) const; - SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, + SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =nullptr, bool bOvrTableLns=true ) const; // Return name of this box. It is determined dynamically and // is calculated from the position in the lines/boxes/table. @@ -456,7 +456,7 @@ public: // width or height when inserting cols or rows Point GetCoordinates() const; - bool IsInHeadline( const SwTable* pTable = 0 ) const; + bool IsInHeadline( const SwTable* pTable = nullptr ) const; // Contains box contents, that can be formatted as a number? bool HasNumContent( double& rNum, sal_uInt32& rFormatIndex, diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index a5281c7b4833..a4ad0b131c38 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -65,8 +65,8 @@ SW_DLLPUBLIC bool UCB_IsReadOnlyFileName( const OUString& rURL ); // !! objects must be deleted from the caller!! bool UCB_GetFileListOfFolder( const OUString& rURL, std::vector<OUString>& rList, - const OUString* pExtension = 0, - std::vector<DateTime*>* pDateTimeList = 0 ); + const OUString* pExtension = nullptr, + std::vector<DateTime*>* pDateTimeList = nullptr ); // is the URL an existing file? SW_DLLPUBLIC bool UCB_IsFile( const OUString& rURL ); diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index b6c8950c14fb..524cb4ebd30f 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -104,7 +104,7 @@ bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell ); // i.e. boxes are added if some overlap at the sides. // Additionally a new box is created and filled with the relevant content. void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, - SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = 0 ); + SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = nullptr ); // Check if selected boxes allow for a valid merge. sal_uInt16 CheckMergeSel( const SwPaM& rPam ); @@ -169,7 +169,7 @@ class _FndBox public: _FndBox( SwTableBox* pB, _FndLine* pFL ) : - pBox(pB), pUpper(pFL), pLineBefore( 0 ), pLineBehind( 0 ) {} + pBox(pB), pUpper(pFL), pLineBefore( nullptr ), pLineBehind( nullptr ) {} const FndLines_t& GetLines() const { return m_Lines; } FndLines_t& GetLines() { return m_Lines; } @@ -187,7 +187,7 @@ public: const bool bBehind ); bool AreLinesToRestore( const SwTable &rTable ) const; - void ClearLineBehind() { pLineBehind = 0; } + void ClearLineBehind() { pLineBehind = nullptr; } }; class _FndLine @@ -200,7 +200,7 @@ class _FndLine _FndLine& operator=(_FndLine const&) = delete; public: - _FndLine(SwTableLine* pL, _FndBox* pFB=0) : pLine(pL), pUpper(pFB) {} + _FndLine(SwTableLine* pL, _FndBox* pFB=nullptr) : pLine(pL), pUpper(pFB) {} const FndBoxes_t& GetBoxes() const { return m_Boxes; } FndBoxes_t& GetBoxes() { return m_Boxes; } const SwTableLine* GetLine() const { return pLine; } @@ -218,7 +218,7 @@ struct _FndPara _FndBox* pFndBox; _FndPara( const SwSelBoxes& rBxs, _FndBox* pFB ) - : rBoxes(rBxs), pFndLine(0), pFndBox(pFB) {} + : rBoxes(rBxs), pFndLine(nullptr), pFndBox(pFB) {} _FndPara( const _FndPara& rPara, _FndBox* pFB ) : rBoxes(rPara.rBoxes), pFndLine(rPara.pFndLine), pFndBox(pFB) {} _FndPara( const _FndPara& rPara, _FndLine* pFL ) diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index cad07df1059f..fa54460edec4 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -52,12 +52,12 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) 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; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 99d7436b3f7d..fde50c3519a7 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -94,7 +94,7 @@ public: // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; void InvalidateTOXMark(); @@ -426,7 +426,7 @@ protected: public: SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm, sal_uInt16 nCreaType, const OUString& rTitle ); - SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 ); + SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = nullptr ); virtual ~SwTOXBase(); virtual bool GetInfo( SfxPoolItem& rInfo ) const override; diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx index 7f7e330b6134..62b99e4ca45f 100644 --- a/sw/inc/txtannotationfld.hxx +++ b/sw/inc/txtannotationfld.hxx @@ -36,7 +36,7 @@ public: virtual ~SwTextAnnotationField(); ::sw::mark::IMark* GetAnnotationMark( - SwDoc* pDoc = NULL ) const; + SwDoc* pDoc = nullptr ) const; }; #endif diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx index eaff28f8c7cc..23d21a20e4ba 100644 --- a/sw/inc/txtrfmrk.hxx +++ b/sw/inc/txtrfmrk.hxx @@ -31,7 +31,7 @@ class SwTextRefMark : public SwTextAttrEnd public: SwTextRefMark( SwFormatRefMark& rAttr, - sal_Int32 const nStart, sal_Int32 const*const pEnd = 0); + sal_Int32 const nStart, sal_Int32 const*const pEnd = nullptr); virtual sal_Int32* GetEnd() override; // SwTextAttr diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx index 40c4024f4494..6538582889fc 100644 --- a/sw/inc/txttxmrk.hxx +++ b/sw/inc/txttxmrk.hxx @@ -32,7 +32,7 @@ class SwTextTOXMark : public SwTextAttrEnd public: SwTextTOXMark( SwTOXMark& rAttr, - sal_Int32 const nStart, sal_Int32 const*const pEnd = 0); + sal_Int32 const nStart, sal_Int32 const*const pEnd = nullptr); virtual ~SwTextTOXMark(); virtual sal_Int32 *GetEnd() override; // SwTextAttr diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index be74d1a3c210..298c9ca69941 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -54,7 +54,7 @@ protected: bool bCacheComment; mutable OUString * pComment; - static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 ); + static void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = nullptr ); static void RemoveIdxFromRange( SwPaM& rPam, bool bMoveNext ); static void RemoveIdxRel( sal_uLong, const SwPosition& ); @@ -149,11 +149,11 @@ protected: // MoveTo: moves from the NodesArray into the UndoNodesArray. // MoveFrom: moves from the UndoNodesArray into the NodesArray. static void MoveToUndoNds( SwPaM& rPam, - SwNodeIndex* pNodeIdx = 0, - sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 ); + SwNodeIndex* pNodeIdx = nullptr, + sal_uLong* pEndNdIdx = nullptr, sal_Int32 * pEndCntIdx = nullptr ); static void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, SwPosition& rInsPos, - sal_uLong* pEndNdIdx = 0, sal_Int32 * pEndCntIdx = 0 ); + sal_uLong* pEndNdIdx = nullptr, sal_Int32 * pEndCntIdx = nullptr ); // These two methods move the SPoint back/forth from PaM. With it // a range can be spanned for Undo/Redo. (In this case the SPoint diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 3cf2c2c3322f..902e75530423 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -39,7 +39,7 @@ private: bool m_bSkipOverProtectSections : 1; public: - SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = 0 ); + SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = nullptr ); virtual ~SwUnoCrsr(); protected: diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index 5c59c67b9896..41f83af366ce 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -85,7 +85,7 @@ namespace SwUnoCursorHelper , SwPaM& rPam , css::uno::Any *pAny , css::beans::PropertyState& eState - , const SwTextNode* pNode = 0 ); + , const SwTextNode* pNode = nullptr ); void GetCurPageStyle(SwPaM& rPaM, OUString &rString); diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 81ba5ec5dc66..661b9acc5917 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -158,7 +158,7 @@ class SwXShape : public SwXShapeBaseClass, @author OD */ - SdrObject* _GetTopGroupObj( SvxShape* _pSvxShape = 0L ); + SdrObject* _GetTopGroupObj( SvxShape* _pSvxShape = nullptr ); /** method to determine position according to the positioning attributes diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index d9fa41e6b5bc..9a29e8b82178 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -84,7 +84,7 @@ public: static css::uno::Reference<css::text::XTextContent> CreateXParagraph(SwDoc & rDoc, SwTextNode * pTextNode, css::uno::Reference< css::text::XText> - const& xParentText = 0, + const& xParentText = nullptr, const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1); const SwTextNode * GetTextNode() const; @@ -279,8 +279,8 @@ struct SwXParagraphEnumeration css::uno::Reference< css::text::XText > const & xParent, std::shared_ptr<SwUnoCrsr> pCursor, const CursorType eType, - SwStartNode const*const pStartNode = 0, - SwTable const*const pTable = 0); + SwStartNode const*const pStartNode = nullptr, + SwTable const*const pTable = nullptr); }; #endif // INCLUDED_SW_INC_UNOPARAGRAPH_HXX diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index e9cf05ae6839..d19f5f170885 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -66,7 +66,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - void Invalidate() {pDoc = 0;} + void Invalidate() {pDoc = nullptr;} }; class SwXEndnoteProperties : public cppu::WeakAggImplHelper2 @@ -96,7 +96,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - void Invalidate() {pDoc = 0;} + void Invalidate() {pDoc = nullptr;} }; class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2 @@ -126,7 +126,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - void Invalidate() {pDoc = 0;} + void Invalidate() {pDoc = nullptr;} }; class SwXNumberingRules : public cppu::WeakAggImplHelper5 @@ -155,7 +155,7 @@ protected: public: SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering - SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc = NULL); // NumRule for paragraphs, numbering styles + SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc = nullptr); // NumRule for paragraphs, numbering styles SwXNumberingRules(SwDoc& rDoc); //create a new instance static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -202,7 +202,7 @@ public: const SwNumRule* GetNumRule() {return pNumRule;} static bool isInvalidStyle(const OUString &rName); - void Invalidate() {pDocShell = 0;} + void Invalidate() {pDocShell = nullptr;} OUString GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;} static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat( diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index 0394b1b0ab7a..f8fa7463d2e5 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -83,7 +83,7 @@ public: css::uno::Reference< css::text::XText > const& xParent, const enum CursorType eType, SwPosition const& rPos, - SwPosition const*const pMark = 0); + SwPosition const*const pMark = nullptr); SwXTextCursor( css::uno::Reference< css::text::XText > const& xParent, SwPaM const& rSourceCursor, diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 438ca6e2cf2a..f8be80a8dd09 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -492,7 +492,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - void Invalidate() {pxDoc = 0;} + void Invalidate() {pxDoc = nullptr;} }; class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper @@ -608,7 +608,7 @@ public: void AdjustViewOptions( SwPrintData const* const pPrtOptions ); bool checkShell( const SwViewShell& rCompare ) const { return &rCompare == m_pShell; } - void DontTouchThatViewShellItSmellsFunny() { m_pShell = 0; } + void DontTouchThatViewShellItSmellsFunny() { m_pShell = nullptr; } }; #endif diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index b9fa19564af3..359f2e80d8e3 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -138,10 +138,10 @@ struct SwApplyTemplate SwApplyTemplate() : eType(0), nColor(0), - m_pFormatClipboard(0), + m_pFormatClipboard(nullptr), nUndo(0) { - aColl.pTextColl = 0; + aColl.pTextColl = nullptr; } }; @@ -261,7 +261,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // methods for searching // set search context SAL_DLLPRIVATE bool SearchAndWrap(bool bApi = false); - SAL_DLLPRIVATE bool SearchAll(sal_uInt16* pFound = 0); + SAL_DLLPRIVATE bool SearchAll(sal_uInt16* pFound = nullptr); SAL_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions ); SAL_DLLPRIVATE void Replace(); @@ -309,8 +309,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell // used for spell checking and text conversion SAL_DLLPRIVATE void SpellStart( SvxSpellArea eSpell, bool bStartDone, - bool bEndDone, SwConversionArgs *pConvArgs = 0 ); - SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = 0 ); + bool bEndDone, SwConversionArgs *pConvArgs = nullptr ); + SAL_DLLPRIVATE void SpellEnd( SwConversionArgs *pConvArgs = nullptr ); SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell ); SAL_DLLPRIVATE void SpellKontext(bool bOn = true) @@ -536,8 +536,8 @@ public: bool AreOnlyFormsSelected() const; bool HasDrwObj(SdrObject *pSdrObj) const; bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const; - bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL, - vcl::Window* pWin=NULL, bool bIsNewObj=false, bool bSetSelectionToStart=false ); + bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=nullptr, + vcl::Window* pWin=nullptr, bool bIsNewObj=false, bool bSetSelectionToStart=false ); void StateTabWin(SfxItemSet&); @@ -549,7 +549,7 @@ public: // edit links void EditLinkDlg(); - void AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId = 0); + void AutoCaption(const sal_uInt16 nType, const SvGlobalName *pOleId = nullptr); void InsertCaption(const InsCaptionOpt *pOpt); // Async call by Core @@ -565,7 +565,7 @@ public: inline virtual const FmFormShell *GetFormShell() const override { return m_pFormShell; } // so that in the SubShells' DTors m_pShell can be reset if applicable - void ResetSubShell() { m_pShell = 0; } + void ResetSubShell() { m_pShell = nullptr; } virtual void WriteUserData(OUString &, bool bBrowse = false) override; virtual void ReadUserData(const OUString &, bool bBrowse = false) override; @@ -617,8 +617,8 @@ public: //public fuer D&D int InsertGraphic( const OUString &rPath, const OUString &rFilter, - bool bLink = true, GraphicFilter *pFlt = 0, - Graphic* pPreviewGrf = 0, + bool bLink = true, GraphicFilter *pFlt = nullptr, + Graphic* pPreviewGrf = nullptr, bool bRule = false ); void ExecuteScan( SfxRequest& rReq ); diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 42fd3e5ca5b0..5055992f36b6 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -244,7 +244,7 @@ public: { b ? (m_nCoreOptions |= VIEWOPT_1_POSTITS ) : ( m_nCoreOptions &= ~VIEWOPT_1_POSTITS); } static void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ); - static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ); + static sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = nullptr ); inline bool IsShowHiddenChar(bool bHard = false) const { return !m_bReadonly && (m_nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 6e93657ee0dd..61b562b7a753 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -546,10 +546,10 @@ public: SwAccessibleMap* GetAccessibleMap(); - SwViewShell( SwViewShell&, vcl::Window *pWin = 0, OutputDevice *pOut = 0, + SwViewShell( SwViewShell&, vcl::Window *pWin = nullptr, OutputDevice *pOut = nullptr, long nFlags = 0 ); SwViewShell( SwDoc& rDoc, vcl::Window *pWin, - const SwViewOption *pOpt = 0, OutputDevice *pOut = 0, + const SwViewOption *pOpt = nullptr, OutputDevice *pOut = nullptr, long nFlags = 0 ); virtual ~SwViewShell(); diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 48487bcf0b20..0e2da96efe14 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -99,7 +99,7 @@ public: // make a complete swap access to m_pCursorOverlay is needed there void swapContent(SwSelPaintRects& rSwap); - void Show(std::vector<OString>* pSelectionRectangles = 0); + void Show(std::vector<OString>* pSelectionRectangles = nullptr); void Hide(); void Invalidate( const SwRect& rRect ); @@ -112,7 +112,7 @@ public: // check current MapMode of the shell and set possibly the static members. // Optional set the parameters pX, pY static void Get1PixelInLogic( const SwViewShell& rSh, - long* pX = 0, long* pY = 0 ); + long* pX = nullptr, long* pY = nullptr ); }; class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects @@ -128,7 +128,7 @@ private: public: SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ); SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos, - const Point& rPtPos, SwPaM* pRing = 0 ); + const Point& rPtPos, SwPaM* pRing = nullptr ); // note: *intentionally* links the new shell cursor into the old one's Ring SwShellCrsr( SwShellCrsr& ); virtual ~SwShellCrsr(); @@ -152,10 +152,10 @@ public: virtual void SetMark() override; - virtual SwCursor* Create( SwPaM* pRing = 0 ) const override; + virtual SwCursor* Create( SwPaM* pRing = nullptr ) const override; virtual short MaxReplaceArived() override; //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) override; + virtual void SaveTableBoxContent( const SwPosition* pPos = nullptr ) override; bool UpDown( bool bUp, sal_uInt16 nCnt = 1 ); @@ -192,10 +192,10 @@ public: bool IsInside( const Point& rPt ) const; virtual void SetMark() override; - virtual SwCursor* Create( SwPaM* pRing = 0 ) const override; + virtual SwCursor* Create( SwPaM* pRing = nullptr ) const override; virtual short MaxReplaceArived() override; //returns RET_YES/RET_CANCEL/RET_NO - virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) override; + virtual void SaveTableBoxContent( const SwPosition* pPos = nullptr ) override; // true: Cursor can be set to this position. virtual bool IsAtValidPos( bool bPoint = true ) const override; |