diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:38:07 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-06-26 11:38:07 +0000 |
| commit | 60cc28ceffc8fe35896af20e2daae8ee5e070a9a (patch) | |
| tree | 3debffb43ef89211445335e14aca777645576c3c /xmlhelp/source | |
| parent | ac914a4dd4ace03a1d9ccc39158ff839c38f91f0 (diff) | |
INTEGRATION: CWS helplinker01redux (1.3.2); FILE MERGED
2007/06/16 15:47:33 cmc 1.3.2.3: #i78530# and remove leak
2007/06/15 15:13:21 cmc 1.3.2.2: #i78530# solaris stream problem
2007/06/13 12:11:15 cmc 1.3.2.1: #i70155 native HelpLinker
Diffstat (limited to 'xmlhelp/source')
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/HelpCompiler.hxx | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx b/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx index bda591bc3782..2c020f50251e 100644 --- a/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx +++ b/xmlhelp/source/com/sun/star/help/HelpCompiler.hxx @@ -4,9 +4,9 @@ * * $RCSfile: HelpCompiler.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: vg $ $Date: 2007-06-08 15:00:57 $ + * last change: $Author: hr $ $Date: 2007-06-26 12:38:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,6 @@ #include <osl/file.hxx> #define EMULATEORIGINAL 1 -//#define CMCDEBUG #ifdef CMCDEBUG #define HCDBG(foo) do { if (1) foo; } while(0) #else @@ -240,17 +239,25 @@ public: appl_hidlist(NULL), appl_keywords(NULL), appl_helptexts(NULL), appl_doc(NULL), default_hidlist(NULL), default_keywords(NULL), default_helptexts(NULL), default_doc(NULL) {} - ~StreamTable() + void dropdefault() { - delete appl_hidlist; - delete appl_keywords; - delete appl_helptexts; - if (appl_doc) xmlFreeDoc(appl_doc); delete default_hidlist; delete default_keywords; delete default_helptexts; if (default_doc) xmlFreeDoc(default_doc); } + void dropappl() + { + delete appl_hidlist; + delete appl_keywords; + delete appl_helptexts; + if (appl_doc) xmlFreeDoc(appl_doc); + } + ~StreamTable() + { + dropappl(); + dropdefault(); + } }; class HelpCompiler |