diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-09 14:36:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-09 14:37:53 +0100 |
| commit | 7b355ad06e11bd81ce15f2a08044d6bbfae59131 (patch) | |
| tree | a11ce08f3f09e7fbdb68b80341ba42c460dafcb5 /sw/inc/dbmgr.hxx | |
| parent | 3011a704d9ff8ddd052165150a5cd91166fad69d (diff) | |
Resolves: tdf#101382 turn SetMailMergeConfigItem into a shared_ptr
so if the SwView it nominally belongs to is deleted while a
mail merge wizard is open it still exists while the wizard
has a ref to it
Change-Id: I4f5acbcc1ea6404851cf6e0179fd3c795342f726
Diffstat (limited to 'sw/inc/dbmgr.hxx')
| -rw-r--r-- | sw/inc/dbmgr.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index af2f73aa7319..af22755f2a21 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -293,7 +293,7 @@ public: inline bool IsMergeOk() { return MergeStatus::OK == m_aMergeStatus; }; inline bool IsMergeError() { return MergeStatus::ERROR <= m_aMergeStatus; }; - static SwMailMergeConfigItem* PerformMailMerge(SwView* pView); + static std::shared_ptr<SwMailMergeConfigItem> PerformMailMerge(SwView* pView); /// Initialize data fields that lack name of database. inline bool IsInitDBFields() const { return bInitDBFields; } |