diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-12 15:39:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-16 08:22:20 +0200 |
| commit | 73c29a2978f967d317235d524aad535a6bafbff0 (patch) | |
| tree | 7ac9c0d90c133a312a0654d80083ef988c6e8ce3 /helpcompiler/source | |
| parent | 2e0cf814671e99a1d1a902a5828768c620c4674c (diff) | |
loplugin:useuniqueptr in StreamTable
Change-Id: I6a6314a3e6df9edfb6d92d2afbc1567195946292
Reviewed-on: https://gerrit.libreoffice.org/52885
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'helpcompiler/source')
| -rw-r--r-- | helpcompiler/source/HelpCompiler.cxx | 6 | ||||
| -rw-r--r-- | helpcompiler/source/HelpLinker.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx index cc8c319e58a5..2c56ecafc628 100644 --- a/helpcompiler/source/HelpCompiler.cxx +++ b/helpcompiler/source/HelpCompiler.cxx @@ -476,9 +476,9 @@ bool HelpCompiler::compile() streamTable.dropappl(); streamTable.appl_doc = docResolvedDoc; - streamTable.appl_hidlist = aparser.hidlist.release(); - streamTable.appl_helptexts = aparser.helptexts.release(); - streamTable.appl_keywords = aparser.keywords.release(); + streamTable.appl_hidlist = std::move(aparser.hidlist); + streamTable.appl_helptexts = std::move(aparser.helptexts); + streamTable.appl_keywords = std::move(aparser.keywords); streamTable.document_id = documentId; streamTable.document_path = fileName; diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx index 315ce57035ca..b146349200b7 100644 --- a/helpcompiler/source/HelpLinker.cxx +++ b/helpcompiler/source/HelpLinker.cxx @@ -383,7 +383,7 @@ void HelpLinker::link() // add once this as its own id. addBookmark( pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB); - const HashSet *hidlist = streamTable.appl_hidlist; + const HashSet *hidlist = streamTable.appl_hidlist.get(); if (hidlist && !hidlist->empty()) { // now iterate over all elements of the hidlist @@ -403,7 +403,7 @@ void HelpLinker::link() } // now the keywords - const Hashtable *anchorToLL = streamTable.appl_keywords; + const Hashtable *anchorToLL = streamTable.appl_keywords.get(); if (anchorToLL && !anchorToLL->empty()) { std::string fakedHid = URLEncoder::encode(documentPath); @@ -424,7 +424,7 @@ void HelpLinker::link() } // and last the helptexts - const Stringtable *helpTextHash = streamTable.appl_helptexts; + const Stringtable *helpTextHash = streamTable.appl_helptexts.get(); if (helpTextHash && !helpTextHash->empty()) { for (auto const& elem : *helpTextHash) |