CWS gnumake4: convert linguistic to new build system

2 files changed, 8 insertions, 10 deletions

diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index efbe43359474..33918ef20bec 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -137,17 +137,17 @@ Thesaurus::~Thesaurus()
 
     if (pPropHelper)
         pPropHelper->RemoveAsPropListener();
+    delete pPropHelper;
 }
 
 
-PropertyHelper_Thes & Thesaurus::GetPropHelper_Impl()
+PropertyHelper_Thesaurus& Thesaurus::GetPropHelper_Impl()
 {
     if (!pPropHelper)
     {
         Reference< XPropertySet >   xPropSet( GetLinguProperties(), UNO_QUERY );
 
-        pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
-        xPropHelper = pPropHelper;
+        pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
         pPropHelper->AddAsPropListener();   //! after a reference is established
     }
     return *pPropHelper;
@@ -342,7 +342,7 @@ Sequence < Reference < ::com::sun::star::linguistic2::XMeaning > > SAL_CALL Thes
     mentry * pmean = NULL;
     sal_Int32 nmean = 0;
 
-    PropertyHelper_Thes &rHelper = GetPropHelper();
+    PropertyHelper_Thesaurus &rHelper = GetPropHelper();
     rHelper.SetTmpPropVals( rProperties );
 
     MyThes * pTH = NULL;
@@ -601,8 +601,7 @@ void SAL_CALL Thesaurus::initialize( const Sequence< Any >& rArguments )
             //! And the reference to the UNO-functions while increasing
             //! the ref-count and will implicitly free the memory
             //! when the object is not longer used.
-            pPropHelper = new PropertyHelper_Thes( (XThesaurus *) this, xPropSet );
-            xPropHelper = pPropHelper;
+            pPropHelper = new PropertyHelper_Thesaurus( (XThesaurus *) this, xPropSet );
             pPropHelper->AddAsPropListener();   //! after a reference is established
         }
         else
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index b0595ad4286c..b6cfb534bab5 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -85,8 +85,7 @@ class Thesaurus :
     Sequence< Locale >                      aSuppLocales;
 
     ::cppu::OInterfaceContainerHelper       aEvtListeners;
-    Reference< XPropertyChangeListener >    xPropHelper;
-    linguistic::PropertyHelper_Thes *       pPropHelper;
+    linguistic::PropertyHelper_Thesaurus*       pPropHelper;
     sal_Bool                                    bDisposing;
     CharClass **                            aCharSetInfo;
     MyThes **                               aThes;
@@ -104,8 +103,8 @@ class Thesaurus :
     Thesaurus(const Thesaurus &);
     Thesaurus & operator = (const Thesaurus &);
 
-    linguistic::PropertyHelper_Thes &   GetPropHelper_Impl();
-    linguistic::PropertyHelper_Thes &   GetPropHelper()
+    linguistic::PropertyHelper_Thesaurus&   GetPropHelper_Impl();
+    linguistic::PropertyHelper_Thesaurus&   GetPropHelper()
     {
         return pPropHelper ? *pPropHelper : GetPropHelper_Impl();
     }