summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-03-09 11:43:17 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-03-09 11:43:17 +0000
commit3aeab8602932f3750079cd4e866c967041bbc957 (patch)
treef8417ce76bd5ff3f5dc6ac7f964de3403ad2991d /lingucomponent
parent1c83de0ee95cdf7a7118101e194b669cb13c27d0 (diff)
INTEGRATION: CWS ooo20040225 (1.2.2); FILE MERGED
2004/02/14 11:15:06 khendricks 1.2.2.1: syncing the 680 tree with my local lingucomponent tree
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/thesaurus/libnth/makefile.mk8
-rw-r--r--lingucomponent/source/thesaurus/libnth/nthesimp.cxx30
-rw-r--r--lingucomponent/source/thesaurus/mythes/Makefile2
3 files changed, 23 insertions, 17 deletions
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index 955a97e485b2..88c263438a84 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: hr $ $Date: 2004-02-04 12:59:24 $
+# last change: $Author: hr $ $Date: 2004-03-09 12:42:53 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -79,10 +79,10 @@ MYTHESLIB=libmythes.lib
.IF "$(ULINGULIB)"==""
.IF "$(GUI)"=="UNX"
-ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX)
+ULINGULIB=-lulingu
.ENDIF # unx
.IF "$(GUI)"=="WNT"
-ULINGULIB=$(LIBPRE) ulingu.lib
+ULINGULIB=libulingu.lib
.ENDIF # wnt
.ENDIF
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 3e5d3fffd1ee..91c39f884fa1 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -3,9 +3,9 @@
* $RCSfile: nthesimp.cxx,v $
* (modified version of sspellimp.cxx)
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: hr $ $Date: 2004-02-04 13:00:19 $
+ * last change: $Author: hr $ $Date: 2004-03-09 12:43:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -92,7 +92,7 @@
#include <linguistic/lngprops.hxx>
#include "nthesdta.hxx"
#include <dictmgr.hxx>
-#include <csutil.hxx>
+
// values asigned to capitalization types
#define CAPTYPE_UNKNOWN 0
@@ -144,23 +144,29 @@ Thesaurus::Thesaurus() :
Thesaurus::~Thesaurus()
{
- for (int i = 0; i < numthes; i++) {
- if (aThes[i]) delete aThes[i];
- aThes[i] = NULL;
- if (aCharSetInfo[i]) delete aCharSetInfo[i];
- aCharSetInfo[i] = NULL;
+ if (aThes) {
+ for (int i = 0; i < numthes; i++) {
+ if (aThes[i]) delete aThes[i];
+ aThes[i] = NULL;
+ }
+ delete[] aThes;
}
- if (aThes) delete[] aThes;
aThes = NULL;
- if (aCharSetInfo) delete[] aCharSetInfo;
+ if (aCharSetInfo) {
+ for (int i = 0; i < numthes; i++) {
+ if (aCharSetInfo[i]) delete aCharSetInfo[i];
+ aCharSetInfo[i] = NULL;
+ }
+ delete[] aCharSetInfo;
+ }
aCharSetInfo = NULL;
+ numthes = 0;
if (aTEncs) delete[] aTEncs;
aTEncs = NULL;
if (aTLocs) delete[] aTLocs;
aTLocs = NULL;
if (aTNames) delete[] aTNames;
aTNames = NULL;
- numthes = 0;
if (pPropHelper)
pPropHelper->RemoveAsPropListener();
@@ -190,7 +196,7 @@ Sequence< Locale > SAL_CALL Thesaurus::getLocales()
dictentry * upthes; // shared thesaurus list entry pointer
SvtPathOptions aPathOpt;
int numusr; // number of user dictionary entries
- int numshr = 0; // number of shared dictionary entries
+ int numshr; // number of shared dictionary entries
if (!numthes) {
diff --git a/lingucomponent/source/thesaurus/mythes/Makefile b/lingucomponent/source/thesaurus/mythes/Makefile
index 39d3cf71f9dc..b1d811296714 100644
--- a/lingucomponent/source/thesaurus/mythes/Makefile
+++ b/lingucomponent/source/thesaurus/mythes/Makefile
@@ -1,7 +1,7 @@
CXX=g++
-CXXFLAGS= -O2 -Wall -ansi -pedantic -DMYTHES_STANDALONE -I.
+CXXFLAGS= -O2 -Wall -ansi -pedantic -I.
LDFLAGS=-L. -lmythes