diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-09-19 17:46:22 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-19 13:06:19 +0200 |
| commit | f83b97f7ae5597462c3b22fc273ca477b2e6fa35 (patch) | |
| tree | 00b805ec8d229bd71b051272d1055e65a55af23f /include | |
| parent | a1eecccadd558e585794182920f945862ef34c0c (diff) | |
svx: Simplify FmSearchEngine's code with std::unique_ptr
Change-Id: Ibda0f912c940091676889529224488846c91b50f
Reviewed-on: https://gerrit.libreoffice.org/42456
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fmsrcimp.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 8e21cc92473d..112f4314abd8 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -36,6 +36,7 @@ #include <osl/thread.hxx> #include <deque> +#include <memory> #include <vector> enum class TransliterationFlags; @@ -171,8 +172,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine final FieldCollection m_arrUsedFields; sal_Int32 m_nCurrentFieldIndex; // the last parameter of RebuildUsedFields, it allows checks in FormatField - typedef std::vector<svxform::ControlTextWrapper*> ControlTextSuppliers; - ControlTextSuppliers m_aControlTexts; + std::vector<std::unique_ptr<svxform::ControlTextWrapper>> + m_aControlTexts; CursorWrapper m_xOriginalIterator; CursorWrapper m_xClonedIterator; @@ -273,8 +274,6 @@ public: const OUString& strVisibleFields, const InterfaceArray& arrFields); - ~FmSearchEngine(); - /** the link will be called on every record and after the completion of the search, the parameter is a pointer to a FmSearchProgress structure the handler should be in any case thread-safe |