diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:25:17 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:48 +0100 |
commit | 28f4bee7bd7378141d8569186162e1a3166eb012 (patch) | |
tree | 97cb855eec76da937068cda5c5f0f7d5bcd61e47 /include | |
parent | bf057fab3c0d17bf2832c8d9fc6d34b1b859e660 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I7fc4b4d5c895f241cfb052b009e943e073f3befe
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/asynclink.hxx | 20 | ||||
-rw-r--r-- | include/svtools/brwbox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ctrltool.hxx | 2 | ||||
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 4 | ||||
-rw-r--r-- | include/svtools/ehdl.hxx | 10 | ||||
-rw-r--r-- | include/svtools/embedhlp.hxx | 4 | ||||
-rw-r--r-- | include/svtools/fmtfield.hxx | 4 | ||||
-rw-r--r-- | include/svtools/grfmgr.hxx | 34 | ||||
-rw-r--r-- | include/svtools/headbar.hxx | 2 | ||||
-rw-r--r-- | include/svtools/htmlout.hxx | 24 | ||||
-rw-r--r-- | include/svtools/imap.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ivctrl.hxx | 8 | ||||
-rw-r--r-- | include/svtools/localresaccess.hxx | 2 | ||||
-rw-r--r-- | include/svtools/parhtml.hxx | 2 | ||||
-rw-r--r-- | include/svtools/ruler.hxx | 10 | ||||
-rw-r--r-- | include/svtools/stringtransfer.hxx | 4 | ||||
-rw-r--r-- | include/svtools/svlbitm.hxx | 4 | ||||
-rw-r--r-- | include/svtools/svtabbx.hxx | 24 | ||||
-rw-r--r-- | include/svtools/toolbarmenu.hxx | 2 | ||||
-rw-r--r-- | include/svtools/treelist.hxx | 22 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 22 | ||||
-rw-r--r-- | include/svtools/xwindowitem.hxx | 2 |
22 files changed, 105 insertions, 105 deletions
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index f0fc74cec2af..2c1421cd1c49 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -47,20 +47,20 @@ class SVT_DLLPUBLIC AsynchronLink public: AsynchronLink( const Link<void*,void>& rLink ) : _aLink( rLink ) - , _nEventId( 0 ) - , _pIdle( 0 ) + , _nEventId( nullptr ) + , _pIdle( nullptr ) , _bInCall( false ) - , _pDeleted( 0 ) - , _pArg( 0 ) - , _pMutex( 0 ) + , _pDeleted( nullptr ) + , _pArg( nullptr ) + , _pMutex( nullptr ) {} AsynchronLink() - : _nEventId( 0 ) - , _pIdle( 0 ) + : _nEventId( nullptr ) + , _pIdle( nullptr ) , _bInCall( false ) - , _pDeleted( 0 ) - , _pArg( 0 ) - , _pMutex( 0 ) + , _pDeleted( nullptr ) + , _pArg( nullptr ) + , _pMutex( nullptr ) {} ~AsynchronLink(); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index ffbef7f3c8f0..2b641f9b8944 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -526,7 +526,7 @@ public: long NextSelectedRow(); const MultiSelection* GetColumnSelection() const { return pColSel; } const MultiSelection* GetSelection() const - { return bMultiSelection ? uRow.pSel : 0; } + { return bMultiSelection ? uRow.pSel : nullptr; } long FirstSelectedColumn( ) const; diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 6bec2bd8e25e..263846e35814 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -160,7 +160,7 @@ private: public: FontList( OutputDevice* pDevice, - OutputDevice* pDevice2 = NULL, + OutputDevice* pDevice2 = nullptr, bool bAll = true ); ~FontList(); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9fdd5ec22b72..baa82f7ab54b 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -465,13 +465,13 @@ namespace svt public: BrowserMouseEventPtr() - : pEvent(NULL) + : pEvent(nullptr) , bDown(false) { } ~BrowserMouseEventPtr(){Clear();} - bool Is() const {return pEvent != NULL;} + bool Is() const {return pEvent != nullptr;} bool IsDown() const {return bDown;} const BrowserMouseEvent* operator->() const {return pEvent;} const BrowserMouseEvent& operator*() const {return *pEvent;} diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 612e44b0d180..23f5ce7a34ab 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -33,11 +33,11 @@ class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext { public: SfxErrorContext( - sal_uInt16 nCtxIdP, vcl::Window *pWin=0, - sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); + sal_uInt16 nCtxIdP, vcl::Window *pWin=nullptr, + sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr); SfxErrorContext( - sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=0, - sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); + sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window *pWin=nullptr, + sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr); bool GetString(sal_uLong nErrId, OUString &rStr) override; private: @@ -50,7 +50,7 @@ private: class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler { public: - SfxErrorHandler(sal_uInt16 nId, sal_uLong lStart, sal_uLong lEnd, ResMgr *pMgr=0); + SfxErrorHandler(sal_uInt16 nId, sal_uLong lStart, sal_uLong lEnd, ResMgr *pMgr=nullptr); virtual ~SfxErrorHandler(); protected: diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index aee98433402b..7dad21d020c8 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -91,11 +91,11 @@ public: sal_Int64 GetViewAspect() const; void SetViewAspect( sal_Int64 nAspect ); - const Graphic* GetGraphic( OUString* pMediaType = NULL ) const; + const Graphic* GetGraphic( OUString* pMediaType = nullptr ) const; // the original size of the object ( size of the icon for iconified object ) // no conversion is done if no target mode is provided - Size GetSize( MapMode* pTargetMapMode = NULL ) const; + Size GetSize( MapMode* pTargetMapMode = nullptr ) const; void SetGraphic( const Graphic& rGraphic, const OUString& rMediaType ); void SetGraphicStream( diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 6426772295cd..1256e5b8de61 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -95,7 +95,7 @@ protected: bool m_bUseInputStringForFormatting; public: - FormattedField(vcl::Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0); + FormattedField(vcl::Window* pParent, WinBits nStyle = 0, SvNumberFormatter* pInitialFormatter = nullptr, sal_Int32 nFormatKey = 0); // Min-/Max-management bool HasMinValue() const { return m_bHasMin; } @@ -260,7 +260,7 @@ protected: public: DoubleNumericField(vcl::Window* pParent, WinBits nStyle = 0) :FormattedField(pParent, nStyle) - ,m_pNumberValidator( NULL ) + ,m_pNumberValidator( nullptr ) { ResetConformanceTester(); } diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 55399e340a6f..bd8a16469cdd 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -202,8 +202,8 @@ private: void SVT_DLLPRIVATE ImplAssignGraphicData(); void SVT_DLLPRIVATE ImplSetGraphicManager( const GraphicManager* pMgr, - const OString* pID = NULL, - const GraphicObject* pCopyObj = NULL + const OString* pID = nullptr, + const GraphicObject* pCopyObj = nullptr ); void SVT_DLLPRIVATE ImplAutoSwapIn(); bool SVT_DLLPRIVATE ImplGetCropParams( @@ -326,10 +326,10 @@ protected: void SetSwapState(); public: - GraphicObject( const GraphicManager* pMgr = NULL ); - GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL ); - GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = NULL ); - explicit GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr = NULL ); + GraphicObject( const GraphicManager* pMgr = nullptr ); + GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = nullptr ); + GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = nullptr ); + explicit GraphicObject( const OString& rUniqueID, const GraphicManager* pMgr = nullptr ); virtual ~GraphicObject(); GraphicObject& operator=( const GraphicObject& rCacheObj ); @@ -348,12 +348,12 @@ public: OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, + const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD ) const; const Graphic& GetGraphic() const; - void SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj = 0); + void SetGraphic( const Graphic& rGraphic, const GraphicObject* pCopyObj = nullptr); void SetGraphic( const Graphic& rGraphic, const OUString& rLink ); /** Get graphic transformed according to given attributes @@ -386,7 +386,7 @@ public: const MapMode& rDestMap, const GraphicAttr& rAttr ) const; - Graphic GetTransformedGraphic( const GraphicAttr* pAttr = NULL ) const; // TODO: Change to Impl + Graphic GetTransformedGraphic( const GraphicAttr* pAttr = nullptr ) const; // TODO: Change to Impl void SetAttr( const GraphicAttr& rAttr ); const GraphicAttr& GetAttr() const { return maAttr; } @@ -425,7 +425,7 @@ public: OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, + const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD ); @@ -467,7 +467,7 @@ public: const Rectangle& rArea, const Size& rSize, const Size& rOffset, - const GraphicAttr* pAttr = NULL, + const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, int nTileCacheSize1D=128 ); @@ -477,12 +477,12 @@ public: const Point& rPt, const Size& rSz, long nExtraData = 0L, - const GraphicAttr* pAttr = NULL, + const GraphicAttr* pAttr = nullptr, GraphicManagerDrawFlags nFlags = GraphicManagerDrawFlags::STANDARD, - OutputDevice* pFirstFrameOutDev = NULL + OutputDevice* pFirstFrameOutDev = nullptr ); - void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L ); + void StopAnimation( OutputDevice* pOut = nullptr, long nExtraData = 0L ); static GraphicObject CreateGraphicObjectFromURL( const OUString &rURL ); // will inspect an object ( e.g. a control ) for any 'ImageURL' @@ -539,7 +539,7 @@ private: const BitmapEx& rBmpEx, const GraphicAttr& rAttr, const GraphicManagerDrawFlags nFlags, - BitmapEx* pBmpEx = NULL + BitmapEx* pBmpEx = nullptr ); static bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, @@ -580,8 +580,8 @@ private: void SVT_DLLPRIVATE ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute, - const OString* pID = NULL, - const GraphicObject* pCopyObj = NULL + const OString* pID = nullptr, + const GraphicObject* pCopyObj = nullptr ); void SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj ); inline bool SVT_DLLPRIVATE ImplHasObjects() const { return !maObjList.empty(); } diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index edbba5d95452..0d5dc458a9d8 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -273,7 +273,7 @@ private: SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh, bool bDrag, const Rectangle& rItemRect, const Rectangle* pRect, DrawFlags nFlags); SVT_DLLPRIVATE void ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos, bool bHigh = false, - bool bDrag = false, const Rectangle* pRect = NULL); + bool bDrag = false, const Rectangle* pRect = nullptr); SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos, bool bEnd = false, bool bDirect = false ); SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand ); diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 671565ff6826..50d2c8b8cf06 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -55,17 +55,17 @@ struct HTMLOutFuncs { SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr, bool bOn = true, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252); SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar, HTMLOutContext& rContext, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, @@ -73,11 +73,11 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&, const HTMLOutEvent *pEventTable, bool bOutStarBasic, - const sal_Char *pDelim = 0, - const sal_Char *pIndentArea = 0, - const sal_Char *pIndentMap = 0, + const sal_Char *pDelim = nullptr, + const sal_Char *pIndentArea = nullptr, + const sal_Char *pIndentMap = nullptr, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); SVT_DLLPUBLIC static SvStream& FlushToAscii( SvStream&, HTMLOutContext& rContext ); SVT_DLLPUBLIC static SvStream& OutScript( SvStream& rStrm, @@ -86,24 +86,24 @@ struct HTMLOutFuncs const OUString& rLanguage, ScriptType eScriptType, const OUString& rSrc, - const OUString *pSBLibrary = 0, - const OUString *pSBModule = 0, + const OUString *pSBLibrary = nullptr, + const OUString *pSBModule = nullptr, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); // the 3rd parameter is an array of HTMLOutEvents which is terminated // by an entry that consists only of 0s SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&, const HTMLOutEvent*, bool bOutStarBasic, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0 ); + OUString *pNonConvertableChars = nullptr ); // <TD SDVAL="..." SDNUM="..."> SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum( bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, - OUString *pNonConvertableChars = 0); + OUString *pNonConvertableChars = nullptr); }; struct HtmlWriterHelper diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index 69880e77fd28..177545761e55 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -83,7 +83,7 @@ public: // not be destroyed from outside IMapObject* GetIMapObject( size_t nPos ) const { - return ( nPos < maList.size() ) ? maList[ nPos ] : NULL; + return ( nPos < maList.size() ) ? maList[ nPos ] : nullptr; } // returns the object which was hit first or NULL; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 9e4c4bc3ab84..fbd2e599aa3b 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -113,8 +113,8 @@ class SvxIconChoiceCtrlEntry { this->pblink->pflink = this->pflink; this->pflink->pblink = this->pblink; - this->pflink = 0; - this->pblink = 0; + this->pflink = nullptr; + this->pblink = nullptr; } public: @@ -265,7 +265,7 @@ public: SvxIconChoiceCtrlEntry* InsertEntry( const OUString& rText, const Image& rImage, sal_uLong nPos = CONTAINER_APPEND, - const Point* pPos = 0, + const Point* pPos = nullptr, SvxIconViewFlags nFlags = SvxIconViewFlags::NONE ); @@ -300,7 +300,7 @@ public: SvxIconChoiceCtrlEntry* GetSelectedEntry() const; #ifdef DBG_UTIL - void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); + void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = nullptr ); #endif bool AutoFontColor () { return _bAutoFontColor; } diff --git a/include/svtools/localresaccess.hxx b/include/svtools/localresaccess.hxx index f9707727dfe5..d0ebc4365f41 100644 --- a/include/svtools/localresaccess.hxx +++ b/include/svtools/localresaccess.hxx @@ -50,7 +50,7 @@ namespace svt :Resource(_rId.SetRT(_rType).SetAutoRelease(false)) ,m_pManager(_rId.GetResMgr()) { - OSL_ENSURE( m_pManager != NULL, "OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" ); + OSL_ENSURE( m_pManager != nullptr, "OLocalResourceAccess::OLocalResourceAccess: invalid resource manager!" ); } ~OLocalResourceAccess() diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index f9faa180c436..07ee08b5ad52 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -205,7 +205,7 @@ public: // Determine the options. pNoConvertToken is the optional token // of an option, for which the CR/LFs are not deleted from the value // of the option. - const HTMLOptions& GetOptions( sal_uInt16 *pNoConvertToken=0 ); + const HTMLOptions& GetOptions( sal_uInt16 *pNoConvertToken=nullptr ); // for asynchronous reading from the SvStream virtual void Continue( int nToken ) override; diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index a5d38f05bbb9..5e2ee847c89c 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -762,7 +762,7 @@ public: RulerSelection GetHoverSelection() const { return maHoverSelection; } using Window::GetType; - RulerType GetType( const Point& rPos, sal_uInt16* pAryPos = NULL ); + RulerType GetType( const Point& rPos, sal_uInt16* pAryPos = nullptr ); void SetNullOffset( long nPos ); long GetNullOffset() const; @@ -775,11 +775,11 @@ public: void SetLeftFrameMargin( long nPos ); void SetRightFrameMargin( long nPos ); - void SetLines( sal_uInt32 n = 0, const RulerLine* pLineAry = NULL ); - void SetBorders( sal_uInt32 n = 0, const RulerBorder* pBrdAry = NULL ); - void SetIndents( sal_uInt32 n = 0, const RulerIndent* pIndentAry = NULL ); + void SetLines( sal_uInt32 n = 0, const RulerLine* pLineAry = nullptr ); + void SetBorders( sal_uInt32 n = 0, const RulerBorder* pBrdAry = nullptr ); + void SetIndents( sal_uInt32 n = 0, const RulerIndent* pIndentAry = nullptr ); - void SetTabs( sal_uInt32 n = 0, const RulerTab* pTabAry = NULL ); + void SetTabs( sal_uInt32 n = 0, const RulerTab* pTabAry = nullptr ); static void DrawTab(vcl::RenderContext& rRenderContext, const Color &rFillColor, const Point& rPos, sal_uInt16 nStyle); diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index 51b811293d73..401a415624cc 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -55,12 +55,12 @@ namespace svt <p>Beware: In opposite to the old DragServer::CopyString, this method does not <em>add</em> the string to the clipboard, instead the old clipboard content is <em>replaced</em>!</p> */ - SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, vcl::Window* _pWindow = NULL ); + SVT_DLLPUBLIC static void CopyString( const OUString& _rContent, vcl::Window* _pWindow = nullptr ); /** extracts a string from the system clipboard given @return <TRUE/> if the extraction was successful, i.e. if the clipboard contained a string content */ - SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, vcl::Window* _pWindow = NULL ); + SVT_DLLPUBLIC static bool PasteString( OUString& _rContent, vcl::Window* _pWindow = nullptr ); /** starts dragging a simple string */ diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index 95dded4e417f..c9b56adacd20 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -69,7 +69,7 @@ private: SVT_DLLPRIVATE void SetWidthAndHeight(); SVT_DLLPRIVATE void InitData( bool bImagesFromDefault, - bool _bRadioBtn, const Control* pControlForSettings = NULL ); + bool _bRadioBtn, const Control* pControlForSettings = nullptr ); public: // include creating default images (CheckBox or RadioButton) SvLBoxButtonData( const Control* pControlForSettings ); @@ -93,7 +93,7 @@ public: void SetImage(SvBmp nIndex, const Image& aImage) { aBmps[(int)nIndex] = aImage; } Image& GetImage(SvBmp nIndex) { return aBmps[(int)nIndex]; } - void SetDefaultImages( const Control* pControlForSettings = NULL ); + void SetDefaultImages( const Control* pControlForSettings = nullptr ); // set images according to the color scheme of the Control // pControlForSettings == NULL: settings are taken from Application bool HasDefaultImages() const; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index e98f4665bf91..1fddbe071da4 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -73,26 +73,26 @@ public: void SetTab( sal_uInt16 nTab, long nValue, MapUnit = MAP_APPFONT ); long GetLogicTab( sal_uInt16 nTab ); - virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0, + virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = nullptr, bool bChildrenOnDemand = false, - sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0, + sal_uLong nPos=TREELIST_APPEND, void* pUserData = nullptr, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) override; virtual SvTreeListEntry* InsertEntry( const OUString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvTreeListEntry* pParent = 0, + SvTreeListEntry* pParent = nullptr, bool bChildrenOnDemand = false, - sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0, + sal_uLong nPos = TREELIST_APPEND, void* pUserData = nullptr, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ) override; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, - sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + sal_uInt16 nCol = 0xffff, void* pUserData = nullptr ); virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent, - sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = nullptr ); virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp, - const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, - sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = nullptr, + sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = nullptr ); virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const override; static OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ); @@ -148,12 +148,12 @@ public: static bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ); virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, - sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) override; + sal_uInt16 nCol = 0xffff, void* pUserData = nullptr ) override; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, SvTreeListEntry* pParent, - sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ) override; + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = nullptr ) override; virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, const Image& rExpandedEntryBmp, - const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL, - sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) override; + const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = nullptr, + sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = nullptr ) override; virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=TREELIST_APPEND) override; virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = TREELIST_APPEND ) override; void RemoveEntry( SvTreeListEntry* _pEntry ); diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index e020aba5c009..255ac20a2fef 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -116,7 +116,7 @@ private: void appendEntry(ToolbarMenuEntry* pEntry); - void implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry* pThisOnly = NULL, bool bHighlight = false); + void implPaint(vcl::RenderContext& rRenderContext, ToolbarMenuEntry* pThisOnly = nullptr, bool bHighlight = false); void implHighlightEntry(vcl::RenderContext& rRenderContext, int nHighlightEntry, bool bHighlight); void implHighlightAtPosition(const MouseEvent& rMEvt, bool bMBDown); diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index fdd7879e075d..b7b42e3dc983 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -82,9 +82,9 @@ class SVT_DLLPUBLIC SvTreeList bool mbEnableInvalidate; SvTreeListEntry* FirstVisible() const { return First(); } - SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvTreeListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; + SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; + SvTreeListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=nullptr ) const; SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const; @@ -142,12 +142,12 @@ public: void RemoveView( SvListView* ); SvListView* GetView( sal_uLong nPos ) const - { return ( nPos < aViewList.size() ) ? aViewList[ nPos ] : NULL; } + { return ( nPos < aViewList.size() ) ? aViewList[ nPos ] : nullptr; } void Broadcast( SvListAction nActionId, - SvTreeListEntry* pEntry1=0, - SvTreeListEntry* pEntry2=0, + SvTreeListEntry* pEntry1=nullptr, + SvTreeListEntry* pEntry2=nullptr, sal_uLong nPos=0 ); @@ -158,8 +158,8 @@ public: sal_uLong GetEntryCount() const { return nEntryCount; } SvTreeListEntry* First() const; - SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; - SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const; + SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; + SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const; SvTreeListEntry* Last() const; SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; @@ -269,13 +269,13 @@ public: SvTreeListEntry* FirstVisible() const { return pModel->FirstVisible(); } - SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const + SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const { return pModel->NextVisible(this,pEntry,pDepth); } - SvTreeListEntry* PrevVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const + SvTreeListEntry* PrevVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=nullptr ) const { return pModel->PrevVisible(this,pEntry,pDepth); } - SvTreeListEntry* LastVisible( sal_uInt16* pDepth=0 ) const + SvTreeListEntry* LastVisible( sal_uInt16* pDepth=nullptr ) const { return pModel->LastVisible(this,pDepth); } SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 667f8ddd3195..ed52d9eeb952 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -171,7 +171,7 @@ public: virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, // If != 0: this Pointer must be used! // If == 0: it needs to be retrieved via the View - SvViewDataItem* pViewData = 0) = 0; + SvViewDataItem* pViewData = nullptr) = 0; virtual SvLBoxItem* Create() const = 0; // View-dependent data is not cloned virtual void Clone(SvLBoxItem* pSource) = 0; @@ -376,19 +376,19 @@ public: } SvTreeListEntry* First() const { - return pModel ? pModel->First() : NULL; + return pModel ? pModel->First() : nullptr; } - SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth = 0 ) const + SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth = nullptr ) const { return pModel->Next(pEntry, pDepth); } - SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth = 0 ) const + SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth = nullptr ) const { return pModel->Prev(pEntry, pDepth); } SvTreeListEntry* Last() const { - return pModel ? pModel->Last() : NULL; + return pModel ? pModel->Last() : nullptr; } SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; @@ -578,7 +578,7 @@ protected: // Is called automatically when inserting/changing Bitmaps, changing the Model etc. virtual void SetTabs(); void AddTab( long nPos, SvLBoxTabFlags nFlags=SvLBoxTabFlags::ADJUST_LEFT, - void* pUserData = 0 ); + void* pUserData = nullptr ); sal_uInt16 TabCount() const { return aTabs.size(); } SvLBoxTab* GetFirstDynamicTab() const; SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const; @@ -645,17 +645,17 @@ public: ); } - virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = 0, + virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent = nullptr, bool bChildrenOnDemand = false, - sal_uLong nPos=TREELIST_APPEND, void* pUserData = 0, + sal_uLong nPos=TREELIST_APPEND, void* pUserData = nullptr, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); virtual SvTreeListEntry* InsertEntry( const OUString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvTreeListEntry* pParent = 0, + SvTreeListEntry* pParent = nullptr, bool bChildrenOnDemand = false, - sal_uLong nPos = TREELIST_APPEND, void* pUserData = 0, + sal_uLong nPos = TREELIST_APPEND, void* pUserData = nullptr, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); const Image& GetDefaultExpandedEntryBmp( ) const; @@ -685,7 +685,7 @@ public: void EnableInplaceEditing( bool bEnable ); // Edits the Entry's first StringItem, 0 == Cursor - void EditEntry( SvTreeListEntry* pEntry = NULL ); + void EditEntry( SvTreeListEntry* pEntry = nullptr ); virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ); virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 90bbe7a96bc1..1326b7814074 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -43,7 +43,7 @@ public: XWindowItem( const XWindowItem &rItem ); virtual ~XWindowItem(); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const override; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; virtual bool operator == ( const SfxPoolItem& rAttr ) const override; vcl::Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); } |