diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-11-14 12:20:05 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-14 16:44:57 +0100 |
commit | 914f9ee7bf7254f2f469bde4cf4c151a4ab25110 (patch) | |
tree | 64c11be2675279addc202bc7abda582a833587c0 /sc/source/ui/inc | |
parent | 285538be45d03e524a404d072a9b0178c74baeaf (diff) |
SetReference ScDocument arg is never null
Change-Id: Ifdfe305e5319926d804e14962e786389b79fe476
Reviewed-on: https://gerrit.libreoffice.org/82682
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/inc')
24 files changed, 29 insertions, 29 deletions
diff --git a/sc/source/ui/inc/IAnyRefDialog.hxx b/sc/source/ui/inc/IAnyRefDialog.hxx index a9c876f15f0d..57d6004c8444 100644 --- a/sc/source/ui/inc/IAnyRefDialog.hxx +++ b/sc/source/ui/inc/IAnyRefDialog.hxx @@ -34,7 +34,7 @@ class SAL_NO_VTABLE IAnyRefDialog : public formula::IControlReferenceHandler public: virtual ~IAnyRefDialog() COVERITY_NOEXCEPT_FALSE {} - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) = 0; virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) = 0; virtual void RefInputDone( bool bForced = false ) = 0; virtual bool IsTableLocked() const = 0; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 7397972a7ada..4dda18a06193 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -117,7 +117,7 @@ public: ScViewData* pViewData, const ScDPObject* pPivotTableObject, bool bCreateNewPivotTable); virtual ~ScPivotLayoutDialog() override; - virtual void SetReference(const ScRange& rReferenceRange, ScDocument* pDocument) override; + virtual void SetReference(const ScRange& rReferenceRange, ScDocument& rDocument) override; virtual void SetActive() override; virtual bool IsRefInputMode() const override; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index b63f549ae574..00a109b311a4 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -26,7 +26,7 @@ public: virtual ~ScRandomNumberGeneratorDialog() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual void SetActive() override; virtual void Close() override; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 6d8582cd8c19..f71c7bb87e25 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -24,7 +24,7 @@ public: virtual ~ScSamplingDialog() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual void SetActive() override; virtual void Close() override; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 5640dfaa5222..69fd05bf92de 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -31,7 +31,7 @@ public: virtual ~ScStatisticsInputOutputDialog() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual void SetActive() override; protected: diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 607e3ac1afe4..83379cd5ebdb 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -30,7 +30,7 @@ public: virtual ~ScStatisticsTwoVariableDialog() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual void SetActive() override; protected: diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 4d18444583ac..2ee83f4c8573 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -108,7 +108,7 @@ public: ScRefHandler(SfxDialogController &rController, SfxBindings* pB, bool bBindRef); virtual ~ScRefHandler() COVERITY_NOEXCEPT_FALSE override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override = 0; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override = 0; virtual void AddRefEntry() override; virtual bool IsRefInputMode() const override; diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index a685120ab14b..33d8f89970cd 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -33,7 +33,7 @@ public: ScPrintAreasDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent); virtual ~ScPrintAreasDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual void AddRefEntry() override; virtual bool IsTableLocked() const override; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index a244e9816504..ff9caa56f4d3 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -116,7 +116,7 @@ public: std::unique_ptr<ScConditionalFormat> GetConditionalFormat() const; - virtual void SetReference(const ScRange&, ScDocument*) override; + virtual void SetReference(const ScRange&, ScDocument&) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; virtual bool IsTableLocked() const override; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 9d292c156e4a..92851019fbad 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -35,7 +35,7 @@ public: const SfxItemSet& rArgSet); virtual ~ScConsolidateDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override { return true; } virtual void SetActive() override; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 5054476613a5..ab705a287426 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -35,7 +35,7 @@ public: ScViewData* ptrViewData); virtual ~ScColRowNameRangesDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 525fd71fb2ea..eae20618d961 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -34,7 +34,7 @@ public: ScViewData* ptrViewData); virtual ~ScDbNameDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index de306709a2b6..8445f1c462a6 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -53,7 +53,7 @@ public: const SfxItemSet& rArgSet); virtual ~ScFilterDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; @@ -161,7 +161,7 @@ public: const SfxItemSet& rArgSet); virtual ~ScSpecialFilterDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 5b19928e933f..8fc552073e5e 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -80,7 +80,7 @@ public: // sc::IAnyRefDialog virtual void ShowReference(const OUString& _sRef) override; virtual void HideReference( bool bDoneRefMode = true ) override; - virtual void SetReference( const ScRange& rRef, ScDocument* pD ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rD ) override; virtual void ReleaseFocus( formula::RefEdit* pEdit ) override; virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) override; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index e2b6c104590e..316c5a62ee07 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -65,7 +65,7 @@ public: virtual ~ScHighlightChgDlg() override; virtual void SetActive() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual void Close() override; virtual bool IsRefInputMode() const override; diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index ff60dcdbb4c3..7180ab6efac2 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -197,7 +197,7 @@ public: bool KeyInput( const KeyEvent& rKEvt, bool bStartEdit ); void EnterHandler( ScEnterMode nBlockMode = ScEnterMode::NORMAL ); void CancelHandler(); - void SetReference( const ScRange& rRef, const ScDocument* pDoc ); + void SetReference( const ScRange& rRef, const ScDocument& rDoc ); void AddRefEntry(); void InputCommand( const CommandEvent& rCEvt ); diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 33f58b36d9c2..8c46f64fb43c 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -78,7 +78,7 @@ public: virtual ~ScNameDefDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 6442eae743a2..e7bb0a1df579 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -113,7 +113,7 @@ public: std::map<OUString, std::unique_ptr<ScRangeName>>* pRangeMap = nullptr); virtual ~ScNameDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index ec922823ce07..3208416989a4 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -93,7 +93,7 @@ public: ScDocShell* pDocSh, const ScAddress& aCursorPos ); virtual ~ScOptSolverDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; virtual void Close() override; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 8c9835f586fc..ce62242f6de2 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -58,7 +58,7 @@ public: ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent); virtual ~ScSimpleRefDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index f6fac01c7f97..3fcadd881e0a 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -39,7 +39,7 @@ public: const ScAddress& aCursorPos ); virtual ~ScSolverDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override; virtual void SetActive() override; virtual void Close() override; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 80d6b16869f6..471039fca686 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -42,7 +42,7 @@ public: const ScRefAddress& rCursorPos); virtual ~ScTabOpDlg() override; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override; + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override; virtual bool IsRefInputMode() const override { return true; } virtual void SetActive() override; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 2c562717f921..314b9ea014a5 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -37,7 +37,7 @@ protected: #ifdef _WIN32 #pragma pack(push, 16) #endif - void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , const ScDocument* ); + void (ScRefHandlerCaller::*m_pSetReferenceHdl)( const ScRange& , const ScDocument& ); void (ScRefHandlerCaller::*m_pSetActiveHdl)(); void (ScRefHandlerCaller::*m_pRefInputStartPreHdl)( formula::RefEdit* pEdit, const formula::RefButton* pButton ); void (ScRefHandlerCaller::*m_pRefInputDonePostHdl)(); @@ -46,7 +46,7 @@ protected: #endif public: - typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , const ScDocument* ); + typedef void (ScRefHandlerCaller::*PFUNCSETREFHDLTYPE)( const ScRange& , const ScDocument& ); typedef void (ScRefHandlerCaller::*PCOMMONHDLTYPE)(); typedef void (ScRefHandlerCaller::*PINPUTSTARTDLTYPE)( formula::RefEdit* pEdit, const formula::RefButton* pButton ); @@ -132,7 +132,7 @@ private: weld::Container* m_pRefEditParent; weld::Container* m_pBtnRefParent; - void SetReferenceHdl( const ScRange& , const ScDocument* ); + void SetReferenceHdl( const ScRange& , const ScDocument& ); void SetActiveHdl(); void RefInputStartPreHdl(formula::RefEdit* pEdit, const formula::RefButton* pButton); void RefInputDonePostHdl(); @@ -176,10 +176,10 @@ public: void SetModal(bool bModal) { m_xDialog->set_modal(bModal); } - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override + virtual void SetReference( const ScRange& rRef, ScDocument& rDoc ) override { if ( m_pHandler && m_pSetReferenceHdl ) - (m_pHandler->*m_pSetReferenceHdl)( rRef, pDoc ); + (m_pHandler->*m_pSetReferenceHdl)( rRef, rDoc ); } virtual void SetActive() override diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 50114022f934..dc73b0382a1e 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -69,7 +69,7 @@ public: virtual ~ScXMLSourceDlg() override; virtual bool IsRefInputMode() const override; - virtual void SetReference(const ScRange& rRange, ScDocument* pDoc) override; + virtual void SetReference(const ScRange& rRange, ScDocument& rDoc) override; virtual void Deactivate() override; virtual void SetActive() override; virtual void Close() override; |