INTEGRATION: CWS geordi2q01 (1.3.24); FILE MERGED

2003/08/18 12:58:41 hr 1.3.24.1: #i18350#: join changes from CWS ooo11rc3

2 files changed, 84 insertions, 96 deletions

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.cxx
index 09316e0a7d8b..f1bdbabd4704 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hprophelp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:02:06 $
+ *  last change: $Author: hjs $ $Date: 2003-08-18 14:34:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,7 @@
 #include <osl/mutex.hxx>
 #endif
 
+
 //using namespace utl;
 using namespace osl;
 using namespace rtl;
@@ -216,20 +217,21 @@ sal_Bool SAL_CALL
     return bRes;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////
 
-static const char *aSP[] =
+static const char *aHP[] =
 {
-    UPN_IS_GERMAN_PRE_REFORM,
-    UPN_IS_IGNORE_CONTROL_CHARACTERS,
-    UPN_IS_USE_DICTIONARY_LIST,
+    UPN_HYPH_MIN_LEADING,
+    UPN_HYPH_MIN_TRAILING,
+    UPN_HYPH_MIN_WORD_LENGTH
 };
 
 
 PropertyHelper_Hyphen::PropertyHelper_Hyphen(
         const Reference< XInterface > & rxSource,
         Reference< XPropertySet > &rxPropSet ) :
-    PropertyChgHelper   ( rxSource, rxPropSet, aSP, sizeof(aSP) / sizeof(aSP[0]) )
+    PropertyChgHelper   ( rxSource, rxPropSet, aHP, sizeof(aHP) / sizeof(aHP[0]) )
 {
     SetDefault();
     INT32 nLen = GetPropNames().getLength();
@@ -238,31 +240,33 @@ PropertyHelper_Hyphen::PropertyHelper_Hyphen(
         const OUString *pPropName = GetPropNames().getConstArray();
         for (INT32 i = 0;  i < nLen;  ++i)
         {
-            BOOL *pbVal     = NULL,
-                 *pbResVal  = NULL;
+                INT16  *pnVal    = NULL;
+            INT16  *pnResVal = NULL;
 
-            if (A2OU( UPN_IS_GERMAN_PRE_REFORM ) == pPropName[i])
+            if (A2OU( UPN_HYPH_MIN_LEADING ) == pPropName[i])
+            {
+                pnVal    = &nHyphMinLeading;
+                pnResVal = &nResHyphMinLeading;
+            }
+            else if (A2OU( UPN_HYPH_MIN_TRAILING ) == pPropName[i])
+            {
+                pnVal    = &nHyphMinTrailing;
+                pnResVal = &nResHyphMinTrailing;
+            }
+            else if (A2OU( UPN_HYPH_MIN_WORD_LENGTH ) == pPropName[i])
             {
-                pbVal    = &bIsGermanPreReform;
-                pbResVal = &bResIsGermanPreReform;
+                pnVal    = &nHyphMinWordLength;
+                pnResVal = &nResHyphMinWordLength;
             }
-                        else if (A2OU( UPN_IS_IGNORE_CONTROL_CHARACTERS ) == pPropName[i])
-                        {
-                                pbVal    = &bIsIgnoreControlCharacters;
-                                pbResVal = &bResIsIgnoreControlCharacters;
-                        }
-                        else if (A2OU( UPN_IS_USE_DICTIONARY_LIST ) == pPropName[i])
-                        {
-                                pbVal    = &bIsUseDictionaryList;
-                                pbResVal = &bResIsUseDictionaryList;
-                        }
-            if (pbVal && pbResVal)
+
+            if (pnVal && pnResVal)
             {
-                rxPropSet->getPropertyValue( pPropName[i] ) >>= *pbVal;
-                *pbResVal = *pbVal;
+                GetPropSet()->getPropertyValue( pPropName[i] ) >>= *pnVal;
+                *pnResVal = *pnVal;
             }
         }
     }
+
 }
 
 
@@ -273,93 +277,75 @@ PropertyHelper_Hyphen::~PropertyHelper_Hyphen()
 
 void PropertyHelper_Hyphen::SetDefault()
 {
-    bResIsGermanPreReform           = bIsGermanPreReform            = FALSE;
-    bResIsIgnoreControlCharacters   = bIsIgnoreControlCharacters    = TRUE;
-    bResIsUseDictionaryList         = bIsUseDictionaryList          = TRUE;
-
-
+    nResHyphMinLeading      = nHyphMinLeading           = 2;
+    nResHyphMinTrailing     = nHyphMinTrailing      = 2;
+    nResHyphMinWordLength           = nHyphMinWordLength            = 0;
 }
 
 
 void SAL_CALL
-    PropertyHelper_Hyphen::propertyChange( const PropertyChangeEvent& rEvt )
+        PropertyHelper_Hyphen::propertyChange( const PropertyChangeEvent& rEvt )
         throw(RuntimeException)
 {
     MutexGuard  aGuard( GetLinguMutex() );
 
     if (GetPropSet().is()  &&  rEvt.Source == GetPropSet())
     {
-        INT16 nLngSvcFlags = 0;
-        BOOL bSCWA = FALSE, // SPELL_CORRECT_WORDS_AGAIN ?
-             bSWWA = FALSE; // SPELL_WRONG_WORDS_AGAIN ?
+        INT16 nLngSvcFlags = LinguServiceEventFlags::HYPHENATE_AGAIN;
 
-        BOOL *pbVal = NULL;
+        INT16   *pnVal = NULL;
         switch (rEvt.PropertyHandle)
         {
-            case UPH_IS_IGNORE_CONTROL_CHARACTERS :
-            {
-                pbVal = &bIsIgnoreControlCharacters;
-                break;
-            }
-            case UPH_IS_GERMAN_PRE_REFORM         :
-            {
-                pbVal = &bIsGermanPreReform;
-                bSCWA = bSWWA = TRUE;
-                break;
-            }
-            case UPH_IS_USE_DICTIONARY_LIST       :
-            {
-                pbVal = &bIsUseDictionaryList;
-                bSCWA = bSWWA = TRUE;
-                break;
-            }
+            case UPH_HYPH_MIN_LEADING     : pnVal = &nHyphMinLeading;    break;
+            case UPH_HYPH_MIN_TRAILING    : pnVal = &nHyphMinTrailing;   break;
+            case UPH_HYPH_MIN_WORD_LENGTH     : pnVal = &nHyphMinWordLength; break;
             default:
-                DBG_ERROR( "unknown property" );
+                   DBG_ERROR( "unknown property" );
         }
-        if (pbVal)
-            rEvt.NewValue >>= *pbVal;
-
-        if (bSCWA)
-            nLngSvcFlags |= LinguServiceEventFlags::SPELL_CORRECT_WORDS_AGAIN;
-        if (bSWWA)
-            nLngSvcFlags |= LinguServiceEventFlags::SPELL_WRONG_WORDS_AGAIN;
-        if (nLngSvcFlags)
+        if (pnVal)
+            rEvt.NewValue >>= *pnVal;
+
+        if (pnVal)
         {
-            LinguServiceEvent aEvt( GetEvtObj(), nLngSvcFlags );
-            LaunchEvent( aEvt );
+            if (nLngSvcFlags)
+            {
+                LinguServiceEvent aEvt( GetEvtObj(), nLngSvcFlags );
+                LaunchEvent( aEvt );
+            }
         }
     }
 }
 
 
+
 void PropertyHelper_Hyphen::SetTmpPropVals( const PropertyValues &rPropVals )
 {
-    // set return value to default value unless there is an
-    // explicitly supplied temporary value
-    bResIsGermanPreReform           = bIsGermanPreReform;
-    bResIsIgnoreControlCharacters   = bIsIgnoreControlCharacters;
-    bResIsUseDictionaryList         = bIsUseDictionaryList;
 
-    //
+        nResHyphMinLeading      = nHyphMinLeading;
+    nResHyphMinTrailing     = nHyphMinTrailing;
+    nResHyphMinWordLength           = nHyphMinWordLength;
+
     INT32 nLen = rPropVals.getLength();
+
     if (nLen)
     {
         const PropertyValue *pVal = rPropVals.getConstArray();
         for (INT32 i = 0;  i < nLen;  ++i)
         {
-            BOOL *pbResVal = NULL;
+            INT16   *pnResVal = NULL;
             switch (pVal[i].Handle)
             {
-                case UPH_IS_GERMAN_PRE_REFORM         : pbResVal = &bResIsGermanPreReform; break;
-                case UPH_IS_IGNORE_CONTROL_CHARACTERS : pbResVal = &bResIsIgnoreControlCharacters; break;
-                case UPH_IS_USE_DICTIONARY_LIST       : pbResVal = &bResIsUseDictionaryList; break;
+                case UPH_HYPH_MIN_LEADING     : pnResVal = &nResHyphMinLeading;    break;
+                case UPH_HYPH_MIN_TRAILING    : pnResVal = &nResHyphMinTrailing;   break;
+                case UPH_HYPH_MIN_WORD_LENGTH     : pnResVal = &nResHyphMinWordLength; break;
                 default:
-                    DBG_ERROR( "unknown property" );
+                  DBG_ERROR( "unknown property" );
             }
-            if (pbResVal)
-                pVal[i].Value >>= *pbResVal;
+            if (pnResVal)
+                pVal[i].Value >>= *pnResVal;
         }
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////
+
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.hxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.hxx
index f5f7593675e5..8b048b0cd807 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.hxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hprophelp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hprophelp.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:02:06 $
+ *  last change: $Author: hjs $ $Date: 2003-08-18 14:34:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -162,45 +162,47 @@ public:
 
 ///////////////////////////////////////////////////////////////////////////
 
-
 class PropertyHelper_Hyphen :
     public PropertyChgHelper
 {
     // default values
-    BOOL    bIsGermanPreReform;
-        BOOL    bIsIgnoreControlCharacters;
-        BOOL    bIsUseDictionaryList;
+        INT16 nHyphMinLeading;
+        INT16 nHyphMinTrailing;
+        INT16 nHyphMinWordLength;
 
     // return values, will be set to default value or current temporary value
-    BOOL    bResIsGermanPreReform;
-        BOOL    bResIsIgnoreControlCharacters;
-        BOOL    bResIsUseDictionaryList;
+        INT16 nResHyphMinLeading;
+        INT16 nResHyphMinTrailing;
+        INT16 nResHyphMinWordLength;
 
     // disallow use of copy-constructor and assignment-operator
     PropertyHelper_Hyphen( const PropertyHelper_Hyphen & );
     PropertyHelper_Hyphen & operator = ( const PropertyHelper_Hyphen & );
 
-    void    SetDefault();
+protected:
+    // PropertyChgHelper
+    virtual void    SetDefault();
 
 public:
     PropertyHelper_Hyphen(
-            const Reference< XInterface > &rxSource,
-            Reference< XPropertySet > &rxPropSet );
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface > &rxSource,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySet > &rxPropSet);
     virtual ~PropertyHelper_Hyphen();
 
+    virtual void    SetTmpPropVals( const com::sun::star::beans::PropertyValues &rPropVals );
+
     // XPropertyChangeListener
     virtual void SAL_CALL
-        propertyChange( const PropertyChangeEvent& rEvt )
-            throw(RuntimeException);
-
-    void    SetTmpPropVals( const PropertyValues &rPropVals );
+        propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt )
+            throw(::com::sun::star::uno::RuntimeException);
 
-        BOOL    IsGermanPreReform() const                       { return bResIsGermanPreReform; }
-        BOOL    IsIgnoreControlCharacters() const       { return bResIsIgnoreControlCharacters; }
-        BOOL    IsUseDictionaryList() const                     { return bResIsUseDictionaryList; }
+    INT16   GetMinLeading() const               { return nHyphMinLeading; }
+    INT16   GetMinTrailing() const              { return nHyphMinTrailing; }
+    INT16   GetMinWordLength() const            { return nHyphMinWordLength; }
 };
 
 ///////////////////////////////////////////////////////////////////////////
 
 #endif
-