diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-10-04 17:52:07 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-05 12:39:45 +0200 |
commit | 4ada921dbb6a431b632cfccd06178dad68860ab6 (patch) | |
tree | 6ee46736cfcfe66ac5eefc18efc14dd546c9b59d /sw/inc/docufld.hxx | |
parent | c42dc1be0c3161e621ed0a667ae6b047f8bb23d4 (diff) |
Evaluate family never passed a null SwDoc*
ditto:
SwTemplNameFieldType ctor
lcl_RestoreRedlines never passed a null SwDoc*
lcl_InsAttr
SwFileNameFieldType ctor
SwRefPageGetFieldType ctor
SwJumpEditFieldType ctor
SwPostItFieldType ctor
SwScriptFieldType ctor
SwMacroFieldType ctor
Change-Id: I61fa1b0e5fba16f9d1be1880dde6c487dca88374
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103927
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc/docufld.hxx')
-rw-r--r-- | sw/inc/docufld.hxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index bc7ef9219093..62363f01bbd1 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -198,9 +198,9 @@ public: class SAL_DLLPUBLIC_RTTI SwFileNameFieldType final : public SwFieldType { - SwDoc *m_pDoc; + SwDoc& m_rDoc; public: - SwFileNameFieldType(SwDoc*); + SwFileNameFieldType(SwDoc&); OUString Expand(sal_uLong) const; virtual std::unique_ptr<SwFieldType> Copy() const override; @@ -224,9 +224,9 @@ public: class SAL_DLLPUBLIC_RTTI SwTemplNameFieldType final : public SwFieldType { - SwDoc *m_pDoc; + SwDoc& m_rDoc; public: - SwTemplNameFieldType(SwDoc*); + SwTemplNameFieldType(SwDoc&); OUString Expand(sal_uLong) const; virtual std::unique_ptr<SwFieldType> Copy() const override; @@ -246,11 +246,11 @@ public: // Document statistics class SAL_DLLPUBLIC_RTTI SwDocStatFieldType final : public SwFieldType { - SwDoc* m_pDoc; + SwDoc& m_rDoc; SvxNumType m_nNumberingType; public: - SwDocStatFieldType(SwDoc*); + SwDocStatFieldType(SwDoc&); OUString Expand(sal_uInt16 nSubType, SvxNumType nFormat) const; virtual std::unique_ptr<SwFieldType> Copy() const override; @@ -320,11 +320,11 @@ public: virtual OUString GetFieldName() const override; - void Evaluate(SwDoc*); + void Evaluate(SwDoc& rDoc); void SetValue(bool bHidden) { m_bIsHidden = bHidden; } static OUString GetColumnName(const OUString& rName); - static OUString GetDBName(const OUString& rName, SwDoc *pDoc); + static OUString GetDBName(const OUString& rName, SwDoc& rDoc); /// Condition virtual void SetPar1(const OUString& rStr) override; @@ -377,10 +377,10 @@ public: class SAL_DLLPUBLIC_RTTI SwMacroFieldType final : public SwFieldType { - SwDoc* m_pDoc; + SwDoc& m_rDoc; public: - SwMacroFieldType(SwDoc*); + SwMacroFieldType(SwDoc&); virtual std::unique_ptr<SwFieldType> Copy() const override; }; @@ -426,15 +426,15 @@ public: class SAL_DLLPUBLIC_RTTI SwPostItFieldType final : public SwFieldType { private: - SwDoc* mpDoc; + SwDoc& mrDoc; public: - SwPostItFieldType(SwDoc* pDoc); + SwPostItFieldType(SwDoc& rDoc); virtual std::unique_ptr<SwFieldType> Copy() const override; - SwDoc* GetDoc() const + SwDoc& GetDoc() const { - return mpDoc; + return mrDoc; }; }; @@ -604,7 +604,7 @@ public: // Relative page numbers - query field. class SwRefPageGetFieldType final : public SwFieldType { - SwDoc* m_pDoc; + SwDoc& m_rDoc; sal_Int16 m_nNumberingType; void UpdateField(SwTextField const * pTextField, @@ -613,10 +613,10 @@ class SwRefPageGetFieldType final : public SwFieldType /// overwritten to update all RefPageGet fields virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) override; public: - SwRefPageGetFieldType( SwDoc* pDoc ); + SwRefPageGetFieldType( SwDoc& rDoc ); virtual std::unique_ptr<SwFieldType> Copy() const override; bool MakeSetList(SetGetExpFields& rTmpLst, SwRootFrame const* pLayout); - SwDoc* GetDoc() const { return m_pDoc; } + SwDoc& GetDoc() const { return m_rDoc; } }; // Query relative page numbering. @@ -641,11 +641,11 @@ public: // Field to jump to and edit. class SwJumpEditFieldType final : public SwFieldType { - SwDoc* m_pDoc; + SwDoc& m_rDoc; sw::WriterMultiListener m_aDep; public: - SwJumpEditFieldType( SwDoc* pDoc ); + SwJumpEditFieldType( SwDoc& rDoc ); virtual std::unique_ptr<SwFieldType> Copy() const override; SwCharFormat* GetCharFormat(); @@ -678,9 +678,9 @@ public: class SwScriptFieldType final : public SwFieldType { - SwDoc* m_pDoc; + SwDoc& m_rDoc; public: - SwScriptFieldType( SwDoc* pDoc ); + SwScriptFieldType( SwDoc& rDoc ); virtual std::unique_ptr<SwFieldType> Copy() const override; }; |