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>

2 files changed, 1 insertions, 23 deletions

diff --git a/helpcompiler/inc/HelpCompiler.hxx b/helpcompiler/inc/HelpCompiler.hxx
index 1acce8f794a3..da0684fd93fc 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -170,22 +170,9 @@ public:
     Stringtable *appl_helptexts;
     xmlDocPtr appl_doc;
 
-    HashSet *default_hidlist;
-    Hashtable *default_keywords;
-    Stringtable *default_helptexts;
-    xmlDocPtr default_doc;
-
     StreamTable() :
-        appl_hidlist(nullptr), appl_keywords(nullptr), appl_helptexts(nullptr), appl_doc(nullptr),
-        default_hidlist(nullptr), default_keywords(nullptr), default_helptexts(nullptr), default_doc(nullptr)
+        appl_hidlist(nullptr), appl_keywords(nullptr), appl_helptexts(nullptr), appl_doc(nullptr)
     {}
-    void dropdefault()
-    {
-        delete default_hidlist;
-        delete default_keywords;
-        delete default_helptexts;
-        if (default_doc) xmlFreeDoc(default_doc);
-    }
     void dropappl()
     {
         delete appl_hidlist;
@@ -196,7 +183,6 @@ public:
     ~StreamTable()
     {
         dropappl();
-        dropdefault();
     }
 };
 
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;