diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-10-02 20:00:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-10-04 15:02:54 +0200 |
| commit | f5198863fc115eb72853ed76dfef037001784b61 (patch) | |
| tree | 6003b566c43fa2e0dc898bc7f791fad671671f96 /sw/inc | |
| parent | 0fab2b1dcd13c0fb9d3bc82e5d8134afbd5ea237 (diff) | |
SwDrawModel ctor always dereferences its SwDoc* arg
DateFormFieldDialog ctor too
SwTextBoxHelper::getCount too
Change-Id: I0d6e41b671af8c7d47ca3cd1f3e62a162ae06aca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103875
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/drawdoc.hxx | 8 | ||||
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sw/inc/textboxhelper.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index de45437efbc2..75882a1bbd63 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -26,14 +26,14 @@ class SwDoc; class SwDrawModel final : public FmFormModel { private: - SwDoc* m_pDoc; + SwDoc& m_rDoc; public: - SwDrawModel( SwDoc* pDoc ); + SwDrawModel(SwDoc& rDoc); virtual ~SwDrawModel() override; - const SwDoc& GetDoc() const { return *m_pDoc; } - SwDoc& GetDoc() { return *m_pDoc; } + const SwDoc& GetDoc() const { return m_rDoc; } + SwDoc& GetDoc() { return m_rDoc; } /// Put needed items for XPropertyList entries from the DrawModel. void PutAreaListItems(SfxItemSet& rSet) const; diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 82540628fb06..c29b98214281 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -397,7 +397,7 @@ public: SwField* pField, bool bPrevButton, bool bNextButton) = 0; virtual VclPtr<VclAbstractDialog> CreateDropDownFormFieldDialog(weld::Widget* pParent, sw::mark::IFieldmark* pDropDownField) = 0; - virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IDateFieldmark* pDateField, SwDoc* pDoc) = 0; + virtual VclPtr<VclAbstractDialog> CreateDateFormFieldDialog(weld::Widget* pParent, sw::mark::IDateFieldmark* pDateField, SwDoc& rDoc) = 0; virtual VclPtr<SfxAbstractTabDialog> CreateSwEnvDlg(weld::Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, bool bInsert) = 0; diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx index b0e017fd010c..5d58305406c2 100644 --- a/sw/inc/textboxhelper.hxx +++ b/sw/inc/textboxhelper.hxx @@ -96,7 +96,7 @@ public: static bool isTextBox(const SwFrameFormat* pFormat, sal_uInt16 nType); /// Count number of shapes in the document, excluding TextBoxes. - static sal_Int32 getCount(const SwDoc* pDoc); + static sal_Int32 getCount(const SwDoc& rDoc); /// Count number of shapes on the page, excluding TextBoxes. static sal_Int32 getCount(SdrPage const* pPage); /// Get a shape by index, excluding TextBoxes. |