diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:15:51 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:26 +0100 |
| commit | e5b721a14c1c8e5261a70588b30353cbb5bd55c6 (patch) | |
| tree | 4363d47845ddc271a032a5f18e402ddbe001891b /include | |
| parent | 11d365241808405483b79efd7879fa04bee8945e (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: Ib336ce9bc95f5c84dd6412ff3c098e68c5b0f4ff
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/IControlReferenceHandler.hxx | 4 | ||||
| -rw-r--r-- | include/formula/formula.hxx | 12 | ||||
| -rw-r--r-- | include/formula/formulahelper.hxx | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx index 5d74fb1d6845..9dbde6cfa57d 100644 --- a/include/formula/IControlReferenceHandler.hxx +++ b/include/formula/IControlReferenceHandler.hxx @@ -31,8 +31,8 @@ namespace formula public: virtual void ShowReference(const OUString& _sRef) = 0; virtual void HideReference( bool bDoneRefMode = true ) = 0; - virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = NULL ) = 0; - virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = NULL ) = 0; + virtual void ReleaseFocus( RefEdit* pEdit, RefButton* pButton = nullptr ) = 0; + virtual void ToggleCollapsed( RefEdit* pEdit, RefButton* pButton = nullptr ) = 0; protected: ~IControlReferenceHandler() {} diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 3dee5709a7ef..760f4b3e10a9 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -55,7 +55,7 @@ public: , bool _bSupportResult , bool _bSupportMatrix ,IFunctionManager* _pFunctionMgr - ,IControlReferenceHandler* _pDlg = NULL ); + ,IControlReferenceHandler* _pDlg = nullptr ); virtual ~FormulaModalDialog(); virtual void dispose() override; @@ -65,8 +65,8 @@ private: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); - void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); + ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = nullptr ); + void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = nullptr ); void RefInputDoneAfter( bool bForced = false ); void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId); @@ -95,7 +95,7 @@ public: , bool _bSupportResult , bool _bSupportMatrix , IFunctionManager* _pFunctionMgr - , IControlReferenceHandler* _pDlg = NULL ); + , IControlReferenceHandler* _pDlg = nullptr ); virtual ~FormulaDlg(); virtual void dispose() override; private: @@ -108,8 +108,8 @@ protected: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); - void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); + ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = nullptr ); + void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = nullptr ); void RefInputDoneAfter( bool bForced = false ); void SetFocusWin(vcl::Window *pWin,const OString& nUniqueId); diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx index 22316bb4beeb..afb7b34694b8 100644 --- a/include/formula/formulahelper.hxx +++ b/include/formula/formulahelper.hxx @@ -49,12 +49,12 @@ namespace formula bool GetNextFunc( const OUString& rFormula, bool bBack, sal_Int32& rFStart, // Ein- und Ausgabe - sal_Int32* pFEnd = NULL, - const IFunctionDescription** ppFDesc = NULL, - ::std::vector< OUString>* pArgs = NULL ) const; + sal_Int32* pFEnd = nullptr, + const IFunctionDescription** ppFDesc = nullptr, + ::std::vector< OUString>* pArgs = nullptr ) const; sal_Int32 GetFunctionStart( const OUString& rFormula, sal_Int32 nStart, - bool bBack, OUString* pFuncName = NULL ) const; + bool bBack, OUString* pFuncName = nullptr ) const; sal_Int32 GetFunctionEnd ( const OUString& rFormula, sal_Int32 nStart ) const; |