summaryrefslogtreecommitdiff
path: root/helpcompiler/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-09-15 15:54:19 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-09-16 08:30:26 +0000
commita2b77b43685884fb4e9be04152a49294fa50db36 (patch)
tree00d599e81a653dc5c663f9dd179970b3e6aa11f2 /helpcompiler/source
parent389939b02bde4ea72268960310bbd1f2984200bf (diff)
loplugin:singlevalfields in basic..idl
Also fix obvious bug in the initialisation of the connectivity::odbc::OConnection::m_bClosed field. Probably closes some kind of connection leak there. Change-Id: I04579cf91bcd6d6c51c697d83971da4142743a82 Reviewed-on: https://gerrit.libreoffice.org/28932 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'helpcompiler/source')
-rw-r--r--helpcompiler/source/HelpLinker.cxx8
1 files changed, 0 insertions, 8 deletions
diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx
index dcf195b77d86..66ad44bbc055 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -412,8 +412,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
addBookmark( pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB);
const HashSet *hidlist = streamTable.appl_hidlist;
- if (!hidlist)
- hidlist = streamTable.default_hidlist;
if (hidlist && !hidlist->empty())
{
// now iterate over all elements of the hidlist
@@ -436,8 +434,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
// now the keywords
const Hashtable *anchorToLL = streamTable.appl_keywords;
- if (!anchorToLL)
- anchorToLL = streamTable.default_keywords;
if (anchorToLL && !anchorToLL->empty())
{
std::string fakedHid = URLEncoder::encode(documentPath);
@@ -463,8 +459,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
// and last the helptexts
const Stringtable *helpTextHash = streamTable.appl_helptexts;
- if (!helpTextHash)
- helpTextHash = streamTable.default_helptexts;
if (helpTextHash && !helpTextHash->empty())
{
Stringtable::const_iterator aEnd = helpTextHash->end();
@@ -486,8 +480,6 @@ void HelpLinker::link() throw(HelpProcessingException, BasicCodeTagger::TaggerEx
{
// now the indexing
xmlDocPtr document = streamTable.appl_doc;
- if (!document)
- document = streamTable.default_doc;
if (document)
{
std::string temp = module;