diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-12-11 20:00:15 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-12-11 20:39:33 +0100 |
| commit | 8a3bb9356219754af7e651a879b5fc8925a18468 (patch) | |
| tree | 6483a8cb622bb8489d98d1975477e7286ef4a395 /xmlhelp/source/cxxhelp/inc | |
| parent | 54dfb9ff07a41d9249302ac2ed0a005d0a8114d4 (diff) | |
tdf#114242 xmlhelp: fix crash in TVChildTarget::Check()
The ... idiomatic C++ code in TVChildTarget::Check() and
SearchAndInsert() handles ownership in non-obvious ways,
so it's not surprising that it took offense at the recent
conversion to std::unique_ptr. Let's at least try to
prevent it from crashing so quickly.
(regression from 4b69497e36b941d4db62ae8d5bad863d032fdc50)
Change-Id: I0981707a61aee1733e727b1c00346d8ec524362e
Diffstat (limited to 'xmlhelp/source/cxxhelp/inc')
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/tvread.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx index bef027c06399..f4bb0631d30d 100644 --- a/xmlhelp/source/cxxhelp/inc/tvread.hxx +++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx @@ -227,7 +227,7 @@ namespace treeview { static void subst( OUString& instpath ); - bool SearchAndInsert(TVDom* p, TVDom* tvDom); + std::unique_ptr<TVDom> SearchAndInsert(std::unique_ptr<TVDom> p, TVDom* tvDom); void Check(TVDom* tvDom); |