summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-29 15:34:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-09-29 20:22:22 +0200
commit89f0a8be6742e23331819324f80f679f8e6cc601 (patch)
treeba9a98db654756bd7a0f3744a52573acec6ce2db /sw/inc
parent663ce5d0f89e9523183ed9ca4cbfcdacf9df4cc8 (diff)
SwNodes never passed a null SwDoc*
and some more like that Change-Id: I02dae666d8935a90afd9c43cfb32a048c69a1d4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103628 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/docary.hxx2
-rw-r--r--sw/inc/ndarr.hxx8
-rw-r--r--sw/inc/txtflcnt.hxx2
-rw-r--r--sw/inc/txttxmrk.hxx2
-rw-r--r--sw/inc/viewsh.hxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index d07819c40d50..9b4a6e80ea26 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -292,7 +292,7 @@ public:
sal_uInt16 GetSize() const { return m_aExtraRedlines.size(); }
SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const { return m_aExtraRedlines.operator[]( uIndex ); }
- SW_DLLPUBLIC bool DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool bSaveInUndo, RedlineType nRedlineTypeToDelete );
+ SW_DLLPUBLIC bool DeleteAllTableRedlines( SwDoc& rDoc, const SwTable& rTable, bool bSaveInUndo, RedlineType nRedlineTypeToDelete );
bool DeleteTableRowRedline ( SwDoc* pDoc, const SwTableLine& rTableLine, bool bSaveInUndo, RedlineType nRedlineTypeToDelete );
bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, RedlineType nRedlineTypeToDelete );
};
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index bb21e7903adc..1492df35be6e 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -101,7 +101,7 @@ class SW_DLLPUBLIC SwNodes final
void InsertNode( const SwNodePtr pNode,
sal_uLong nPos );
- SwDoc* m_pMyDoc; ///< This Doc contains the nodes-array.
+ SwDoc& m_rMyDoc; ///< This Doc contains the nodes-array.
SwNode *m_pEndOfPostIts, *m_pEndOfInserts, ///< These are the fixed ranges.
*m_pEndOfAutotext, *m_pEndOfRedlines;
@@ -129,7 +129,7 @@ class SW_DLLPUBLIC SwNodes final
SwNodes(SwNodes const&) = delete;
SwNodes& operator=(SwNodes const&) = delete;
- SwNodes( SwDoc* pDoc );
+ SwNodes(SwDoc& rDoc);
public:
~SwNodes();
@@ -299,8 +299,8 @@ public:
bool const bCreateFrames = true);
/// Which Doc contains the nodes-array?
- SwDoc* GetDoc() { return m_pMyDoc; }
- const SwDoc* GetDoc() const { return m_pMyDoc; }
+ SwDoc* GetDoc() { return &m_rMyDoc; }
+ const SwDoc* GetDoc() const { return &m_rMyDoc; }
/** Search previous / next content node or table node with frames.
If no end is given begin with the FrameIndex, else start search
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index c9baa25ff21c..b580039446ab 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -40,7 +40,7 @@ public:
inline const SwFlyInContentFrame *GetFlyFrame( const SwFrame *pCurrFrame ) const;
// creates for itself a new FlyFrameFormat.
- void CopyFlyFormat( SwDoc* pDoc );
+ void CopyFlyFormat( SwDoc& rDoc );
};
inline SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame )
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index bcb0a5b06acf..4606fd597a99 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -38,7 +38,7 @@ public:
virtual const sal_Int32 *GetEnd() const override; // SwTextAttr
virtual void SetEnd(sal_Int32) override; // SwTextAttr
- void CopyTOXMark( SwDoc* pDestDoc );
+ void CopyTOXMark( SwDoc& rDestDoc );
// get and set TextNode pointer
const SwTextNode* GetpTextNd() const { return m_pTextNode; }
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 23409190bdf8..57fae99e99ba 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -361,7 +361,7 @@ public:
vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect );
// Fill temporary doc with selected text for Print or PDF export.
- void FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt );
+ void FillPrtDoc( SwDoc& rPrtDoc, const SfxPrinter* pPrt );
// Called internally for Shell. Formats pages.
void CalcPagesForPrint( sal_uInt16 nMax );