undo anything not wizard related in the previous merge-commit

5 files changed, 65 insertions, 71 deletions

diff --git a/lingucomponent/prj/d.lst b/lingucomponent/prj/d.lst
index 4760a299c84d..690135049bb5 100644
--- a/lingucomponent/prj/d.lst
+++ b/lingucomponent/prj/d.lst
@@ -1,53 +1,53 @@
-..\%__SRC%\bin\*.dat %_DEST%\bin%_EXT%\*.dat
-..\%__SRC%\bin\*.idx %_DEST%\bin%_EXT%\*.idx
-..\%__SRC%\bin\*.aff %_DEST%\bin%_EXT%\*.aff
-..\%__SRC%\bin\*.dic %_DEST%\bin%_EXT%\*.dic
-..\%__SRC%\bin\*.lst %_DEST%\bin%_EXT%\*.lst
-
-..\%__SRC%\bin\lnth* %_DEST%\bin%_EXT%\lnth*
-..\%__SRC%\lib\ilnth* %_DEST%\lib%_EXT%\ilnth*
-..\%__SRC%\lib\liblnth.a %_DEST%\lib%_EXT%\liblnth.a
-..\%__SRC%\lib\liblnth*.dylib %_DEST%\lib%_EXT%\liblnth*.dylib
-..\%__SRC%\lib\liblnth*.so %_DEST%\lib%_EXT%\liblnth*.so
-
-..\%__SRC%\bin\spell* %_DEST%\bin%_EXT%\spell*
-..\%__SRC%\lib\ilspell* %_DEST%\lib%_EXT%\ilspell*
-..\%__SRC%\lib\libspell*.dylib %_DEST%\lib%_EXT%\libspell*.dylib
-..\%__SRC%\lib\libspell*.so %_DEST%\lib%_EXT%\libspell*.so
-
-..\%__SRC%\bin\hunspell* %_DEST%\bin%_EXT%\hunspell*
-..\%__SRC%\lib\ilhunspell* %_DEST%\lib%_EXT%\ilhunspell*
-..\%__SRC%\lib\libhunspell*.dylib %_DEST%\lib%_EXT%\libhunspell*.dylib
-..\%__SRC%\lib\libhunspell*.so %_DEST%\lib%_EXT%\libhunspell*.so
-
-..\%__SRC%\bin\hyph* %_DEST%\bin%_EXT%\hyph*
-..\%__SRC%\lib\ihyph* %_DEST%\lib%_EXT%\ihyph*
-..\%__SRC%\lib\libhnj.* %_DEST%\lib%_EXT%\libhnj.*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\libhyphen*.so %_DEST%\lib%_EXT%\libhyphen*.so
-
-..\%__SRC%\bin\ulingu* %_DEST%\bin%_EXT%\ulingu*
-..\%__SRC%\lib\ilulingu* %_DEST%\lib%_EXT%\iulingu*
-..\%__SRC%\lib\libulingu.a %_DEST%\lib%_EXT%\libulingu.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\%__SRC%\bin\guesslan* %_DEST%\bin%_EXT%\guesslan*
-..\%__SRC%\lib\iguesslang* %_DEST%\lib%_EXT%\iguesslang*
-..\%__SRC%\lib\libguesslang*.dylib %_DEST%\lib%_EXT%\libguesslang*.dylib
-..\%__SRC%\lib\libguesslang*.so %_DEST%\lib%_EXT%\libguesslang*.so
-
-..\%__SRC%\lib\libMacOSXSpell*.dylib %_DEST%\lib%_EXT%\libMacOSXSpell*.dylib
-
-
-mkdir: %_DEST%\xml%_EXT%\registry
-mkdir: %_DEST%\xml%_EXT%\registry\data
-mkdir: %_DEST%\xml%_EXT%\registry\data\org
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-..\config\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\*.xcu
-
-..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml%_EXT%\MacOSXSpell.component
-..\%__SRC%\misc\guesslang.component %_DEST%\xml%_EXT%\guesslang.component
-..\%__SRC%\misc\hyphen.component %_DEST%\xml%_EXT%\hyphen.component
-..\%__SRC%\misc\lnth.component %_DEST%\xml%_EXT%\lnth.component
-..\%__SRC%\misc\spell.component %_DEST%\xml%_EXT%\spell.component
+..\%__SRC%\bin\*.dat %_DEST%\bin\*.dat
+..\%__SRC%\bin\*.idx %_DEST%\bin\*.idx
+..\%__SRC%\bin\*.aff %_DEST%\bin\*.aff
+..\%__SRC%\bin\*.dic %_DEST%\bin\*.dic
+..\%__SRC%\bin\*.lst %_DEST%\bin\*.lst
+
+..\%__SRC%\bin\lnth* %_DEST%\bin\lnth*
+..\%__SRC%\lib\ilnth* %_DEST%\lib\ilnth*
+..\%__SRC%\lib\liblnth.a %_DEST%\lib\liblnth.a
+..\%__SRC%\lib\liblnth*.dylib %_DEST%\lib\liblnth*.dylib
+..\%__SRC%\lib\liblnth*.so %_DEST%\lib\liblnth*.so
+
+..\%__SRC%\bin\spell* %_DEST%\bin\spell*
+..\%__SRC%\lib\ilspell* %_DEST%\lib\ilspell*
+..\%__SRC%\lib\libspell*.dylib %_DEST%\lib\libspell*.dylib
+..\%__SRC%\lib\libspell*.so %_DEST%\lib\libspell*.so
+
+..\%__SRC%\bin\hunspell* %_DEST%\bin\hunspell*
+..\%__SRC%\lib\ilhunspell* %_DEST%\lib\ilhunspell*
+..\%__SRC%\lib\libhunspell*.dylib %_DEST%\lib\libhunspell*.dylib
+..\%__SRC%\lib\libhunspell*.so %_DEST%\lib\libhunspell*.so
+
+..\%__SRC%\bin\hyph* %_DEST%\bin\hyph*
+..\%__SRC%\lib\ihyph* %_DEST%\lib\ihyph*
+..\%__SRC%\lib\libhnj.* %_DEST%\lib\libhnj.*
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\libhyphen*.so %_DEST%\lib\libhyphen*.so
+
+..\%__SRC%\bin\ulingu* %_DEST%\bin\ulingu*
+..\%__SRC%\lib\ilulingu* %_DEST%\lib\iulingu*
+..\%__SRC%\lib\libulingu.a %_DEST%\lib\libulingu.a
+..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+
+..\%__SRC%\bin\guesslan* %_DEST%\bin\guesslan*
+..\%__SRC%\lib\iguesslang* %_DEST%\lib\iguesslang*
+..\%__SRC%\lib\libguesslang*.dylib %_DEST%\lib\libguesslang*.dylib
+..\%__SRC%\lib\libguesslang*.so %_DEST%\lib\libguesslang*.so
+
+..\%__SRC%\lib\libMacOSXSpell*.dylib %_DEST%\lib\libMacOSXSpell*.dylib
+
+
+mkdir: %_DEST%\xml\registry
+mkdir: %_DEST%\xml\registry\data
+mkdir: %_DEST%\xml\registry\data\org
+mkdir: %_DEST%\xml\registry\data\org\openoffice
+mkdir: %_DEST%\xml\registry\data\org\openoffice\Office
+..\config\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office\*.xcu
+
+..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml\MacOSXSpell.component
+..\%__SRC%\misc\guesslang.component %_DEST%\xml\guesslang.component
+..\%__SRC%\misc\hyphen.component %_DEST%\xml\hyphen.component
+..\%__SRC%\misc\lnth.component %_DEST%\xml\lnth.component
+..\%__SRC%\misc\spell.component %_DEST%\xml\spell.component
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index e54cc7471407..1f8a5089efce 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -95,15 +95,15 @@ Hyphenator::Hyphenator() :
     numdict = 0;
 }
 
-
 Hyphenator::~Hyphenator()
 {
     if (numdict && aDicts)
     {
-        for (int i=0; i < numdict; i++)
+        for (int i=0; i < numdict; ++i)
         {
-            if (aDicts[i].apCC) delete aDicts[i].apCC;
-            aDicts[i].apCC = NULL;
+            delete aDicts[i].apCC;
+            if (aDicts[i].aPtr)
+                hnj_hyphen_free(aDicts[i].aPtr);
         }
     }
     delete[] aDicts;
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index bc5d1ae66e93..c09723d52a92 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -32,9 +32,7 @@ TARGET	= hyphen_lib
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
-.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
 HNJLIB=-lhyphen
 .ELSE
 HNJLIB=hyphen.lib
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index e210c2e7e501..31bcadce6d0b 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -76,8 +76,8 @@ using ::rtl::OString;
 
 ///////////////////////////////////////////////////////////////////////////
 
-SpellChecker::SpellChecker() :
-    aEvtListeners   ( GetLinguMutex() )
+SpellChecker::SpellChecker()
+    : aEvtListeners(GetLinguMutex())
 {
     aDicts = NULL;
     aDEncs = NULL;
@@ -88,25 +88,24 @@ SpellChecker::SpellChecker() :
     numdict = 0;
 }
 
-
 SpellChecker::~SpellChecker()
 {
     if (aDicts)
     {
-       for (int i = 0; i < numdict; i++)
+       for (int i = 0; i < numdict; ++i)
        {
-            if (aDicts[i]) delete aDicts[i];
+            delete aDicts[i];
             aDicts[i] = NULL;
        }
        delete[] aDicts;
     }
     aDicts = NULL;
     numdict = 0;
-    if (aDEncs) delete[] aDEncs;
+    delete[] aDEncs;
     aDEncs = NULL;
-    if (aDLocs) delete[] aDLocs;
+    delete[] aDLocs;
     aDLocs = NULL;
-    if (aDNames) delete[] aDNames;
+    delete[] aDNames;
     aDNames = NULL;
     if (pPropHelper)
     {
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index d204fb2c7c1b..1cbecd32dd83 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -37,9 +37,6 @@ USE_DEFFILE=TRUE
 .IF "$(GUI)"=="UNX"
 MYTHESLIB=-lmythes
 .ENDIF # unx
-.IF "$(GUI)"=="OS2"
-MYTHESLIB=$(SLB)\libmythes.lib
-.ENDIF # os2
 .IF "$(GUI)"=="WNT"
 MYTHESLIB=libmythes.lib
 .ENDIF # wnt