dv12: Merge with DEV300_m63

47 files changed, 816 insertions, 386 deletions

diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index 85a19ade9996..8830b9144409 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -94,6 +94,7 @@ SHL1STDLIBS= \
         $(COMPHELPERLIB)	\
         $(TKLIB)			\
         $(UNOTOOLSLIB)		\
+        $(SVXCORELIB)		\
         $(SVXLIB)
 
 SHL1LIBS=		$(SLB)$/$(TARGET).lib
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index f7cfafe39c10..c34aceb418a3 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -116,6 +116,7 @@ namespace abp
 
         bool bFirstVisible = true;
         Link aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+        const Size aSpacing( LogicToPixel( Size( 0, 3 ), MAP_APPFONT ) );
         for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
               loop != m_aAllTypes.end(); ++loop )
         {
@@ -125,7 +126,7 @@ namespace abp
             else
             {
                 aItem.m_pItem->SetPosPixel( aTopLeft );
-                aTopLeft.Y() += aItemSize.Height();
+                aTopLeft.Y() += aItemSize.Height() + aSpacing.Height();
                 aItem.m_pItem->SetClickHdl( aTypeSelectionHandler );
                 aItem.m_pItem->Show();
 
diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/main/SOActiveX.h
index f7017d582be9..2bf33f96b4e9 100644
--- a/extensions/source/activex/main/SOActiveX.h
+++ b/extensions/source/activex/main/SOActiveX.h
@@ -163,7 +163,7 @@ public:
     HRESULT GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl );
     HRESULT Cleanup();
     HRESULT TerminateOffice();
-    HRESULT CSOActiveX::GetURL( const OLECHAR* url,
+    HRESULT GetURL( const OLECHAR* url,
                                 const OLECHAR* target );
 
     void CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* pbsc, BYTE* pBytes, DWORD dwSize );
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 7c4a690cd16f..ee7505c8a518 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -40,14 +40,30 @@
 
 namespace extensions { namespace config { namespace ldap {
 
-
+oslModule       LdapConnection::s_Ldap_Module = NULL;
+t_ldap_unbind_s          LdapConnection::s_p_unbind_s = NULL;
+t_ldap_simple_bind_s     LdapConnection::s_p_simple_bind_s = NULL;
+t_ldap_set_option        LdapConnection::s_p_set_option = NULL;
+t_ldap_err2string        LdapConnection::s_p_err2string = NULL;
+t_ldap_init              LdapConnection::s_p_init = NULL;
+t_ldap_msgfree           LdapConnection::s_p_msgfree = NULL;
+t_ldap_get_dn            LdapConnection::s_p_get_dn = NULL;
+t_ldap_first_entry       LdapConnection::s_p_first_entry = NULL;
+t_ldap_search_s          LdapConnection::s_p_search_s = NULL;
+t_ldap_value_free        LdapConnection::s_p_value_free = NULL;
+t_ldap_get_values        LdapConnection::s_p_get_values = NULL;
+t_ldap_memfree           LdapConnection::s_p_memfree = NULL;
 //------------------------------------------------------------------------------
 typedef int LdapErrCode;
 //------------------------------------------------------------------------------
 struct LdapMessageHolder
 {
     LdapMessageHolder() : msg(0) {}
-    ~LdapMessageHolder() { if (msg) ldap_msgfree(msg); }
+    ~LdapMessageHolder()
+    {
+        if (msg)
+            (*LdapConnection::s_p_msgfree)(msg);
+    }
 
     LDAPMessage * msg;
 
@@ -66,7 +82,7 @@ void LdapConnection::disconnect()
 {
     if (mConnection != NULL)
     {
-        ldap_unbind_s(mConnection) ;
+        (*s_p_unbind_s)(mConnection) ;
         mConnection = NULL;
     }
 }
@@ -85,11 +101,11 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
     {
         message.appendAscii(aOperation).appendAscii(": ") ;
     }
-    message.appendAscii(ldap_err2string(aRetCode)).appendAscii(" (") ;
+    message.appendAscii((*LdapConnection::s_p_err2string)(aRetCode)).appendAscii(" (") ;
     sal_Char *stub = NULL ;
 
 #ifndef LDAP_OPT_SIZELIMIT // for use with OpenLDAP
-    ldap_get_lderrno(aConnection, NULL, &stub) ;
+    (*s_p_get_lderrno)(aConnection, NULL, &stub) ;
 #endif
     if (stub != NULL)
     {
@@ -99,7 +115,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
         // string itself. At any rate freeing it seems to
         // cause some undue problems at least on Windows.
         // This call is thus disabled for the moment.
-        //ldap_memfree(stub) ;
+        //(*s_p_memfree)(stub) ;
     }
     else { message.appendAscii(kNoSpecificMessage) ; }
     message.appendAscii(")") ;
@@ -126,20 +142,20 @@ void  LdapConnection::connectSimple()
         initConnection() ;
         // Set Protocol V3
         int version = LDAP_VERSION3;
-        ldap_set_option(mConnection,
+        (*s_p_set_option)(mConnection,
                         LDAP_OPT_PROTOCOL_VERSION,
                         &version);
 
 #ifdef LDAP_X_OPT_CONNECT_TIMEOUT // OpenLDAP doesn't support this and the func
         /* timeout is specified in milliseconds -> 4 seconds*/
         int timeout = 4000;
-        ldap_set_option( mConnection,
+        (*s_p_set_option)( mConnection,
                         LDAP_X_OPT_CONNECT_TIMEOUT,
                         &timeout );
 #endif
 
         // Do the bind
-        LdapErrCode retCode = ldap_simple_bind_s(mConnection,
+        LdapErrCode retCode = (*s_p_simple_bind_s)(mConnection,
                                                mLdapDefinition.mAnonUser ,
                                                mLdapDefinition.mAnonCredentials) ;
 
@@ -160,7 +176,7 @@ void LdapConnection::initConnection()
 
     if (mLdapDefinition.mPort == 0) mLdapDefinition.mPort = LDAP_PORT;
 
-    mConnection = ldap_init(mLdapDefinition.mServer,
+    mConnection = (*s_p_init)(mLdapDefinition.mServer,
                             mLdapDefinition.mPort) ;
     if (mConnection == NULL)
     {
@@ -186,7 +202,7 @@ void LdapConnection::initConnection()
     rtl::OString aUserDn =findUserDn( rtl::OUStringToOString(aUser, RTL_TEXTENCODING_ASCII_US));
 
     LdapMessageHolder result;
-    LdapErrCode retCode = ldap_search_s(mConnection,
+    LdapErrCode retCode = (*s_p_search_s)(mConnection,
                                       aUserDn,
                                       LDAP_SCOPE_BASE,
                                       "(objectclass=*)",
@@ -228,21 +244,21 @@ void LdapConnection::initConnection()
     sal_Char * attributes [2];
     attributes[0]= const_cast<sal_Char *>(LDAP_NO_ATTRS);
     attributes[1]= NULL;
-    LdapErrCode retCode = ldap_search_s(mConnection,
+    LdapErrCode retCode = (*s_p_search_s)(mConnection,
                                       mLdapDefinition.mBaseDN,
                                       LDAP_SCOPE_SUBTREE,
                                       filter.makeStringAndClear(), attributes, 0, &result.msg) ;
 
     checkLdapReturnCode("FindUserDn", retCode,mConnection) ;
     rtl::OString userDn ;
-    LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ;
+    LDAPMessage *entry = (*s_p_first_entry)(mConnection, result.msg) ;
 
     if (entry != NULL)
     {
-        sal_Char *charsDn = ldap_get_dn(mConnection, entry) ;
+        sal_Char *charsDn = (*s_p_get_dn)(mConnection, entry) ;
 
         userDn = charsDn ;
-        ldap_memfree(charsDn) ;
+        (*s_p_memfree)(charsDn) ;
     }
     else
     {
@@ -264,7 +280,7 @@ rtl::OString LdapConnection::getSingleAttribute(
     attributes [0] = aAttribute ;
     attributes [1] = 0 ;
     LdapMessageHolder result ;
-    LdapErrCode retCode = ldap_search_s(mConnection,
+    LdapErrCode retCode = (*s_p_search_s)(mConnection,
                                       aDn,
                                       LDAP_SCOPE_BASE,
                                       "(objectclass=*)",
@@ -277,22 +293,60 @@ rtl::OString LdapConnection::getSingleAttribute(
         return value ;
     }
     checkLdapReturnCode("GetSingleAttribute", retCode, mConnection) ;
-    LDAPMessage *entry = ldap_first_entry(mConnection, result.msg) ;
+    LDAPMessage *entry = (*s_p_first_entry)(mConnection, result.msg) ;
 
     if (entry != NULL)
     {
-        sal_Char **values = ldap_get_values(mConnection, entry,
+        sal_Char **values = (*s_p_get_values)(mConnection, entry,
                                             aAttribute) ;
 
         if (values != NULL)
         {
             if (*values != NULL) { value = *values ; }
-            ldap_value_free(values) ;
+            (*s_p_value_free)(values) ;
         }
     }
     return value ;
 }
 
+extern "C" { static void SAL_CALL thisModule() {} }
+void LdapConnection::loadModule()
+{
+    if ( !s_Ldap_Module )
+    {
+#if defined(WIN) || defined(WNT)
+#       define LIBLDAP "nsldap32v50.dll"
+#else
+#   ifdef WITH_OPENLDAP
+#       define xstr(s) str(s)
+#       define str(s) #s
+#       define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR)
+#   else
+#       define LIBLDAP "libldap50.so"
+#   endif
+#endif
+        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
+
+        // load the dbtools library
+        s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);
+        if ( s_Ldap_Module != NULL )
+        {
+            s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_unbind_s").pData));
+            s_p_simple_bind_s = (t_ldap_simple_bind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_simple_bind_s").pData));
+            s_p_set_option = (t_ldap_set_option)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_set_option").pData));
+            s_p_err2string = (t_ldap_err2string)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_err2string").pData));
+            s_p_init = (t_ldap_init)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_init").pData));
+            s_p_msgfree = (t_ldap_msgfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_msgfree").pData));
+            s_p_get_dn = (t_ldap_get_dn)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_dn").pData));
+            s_p_first_entry = (t_ldap_first_entry)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_first_entry").pData));
+            s_p_search_s = (t_ldap_search_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_search_s").pData));
+            s_p_value_free = (t_ldap_value_free)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_value_free").pData));
+            s_p_get_values = (t_ldap_get_values)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_get_values").pData));
+            s_p_memfree = (t_ldap_memfree)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString::createFromAscii("ldap_memfree").pData));
+        }
+    }
+}
+
 //------------------------------------------------------------------------------
 } } } // extensions.config.ldap
 
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index 9017162c0c5e..47022bb0d615 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -34,10 +34,9 @@
 #include "wrapldapinclude.hxx"
 #include <com/sun/star/ldap/LdapGenericException.hpp>
 
-#ifndef _COM_SUN_STAR_LDAP_LDAP_CONNECTIONEXCEPTION_HPP_
 #include <com/sun/star/ldap/LdapConnectionException.hpp>
-#endif // _COM_SUN_STAR_LDAP_LDAP_CONNECTIONEXCEPTION_HPP_
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <osl/module.h>
 
 namespace extensions { namespace config { namespace ldap {
 
@@ -50,6 +49,18 @@ namespace ldap = css::ldap ;
 struct LdapUserProfile;
 class LdapUserProfileMap;
 
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_unbind_s)( LDAP *ld );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_simple_bind_s)( LDAP *ld, const char *who, const char *passwd );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_set_option)( LDAP *ld, int option, const void *optdata );
+typedef LDAP_API(char *) (LDAP_CALL *t_ldap_err2string)( int err );
+typedef LDAP_API(LDAP *) (LDAP_CALL *t_ldap_init)( const char *defhost, int defport );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_msgfree)( LDAPMessage *lm );
+typedef LDAP_API(char *) (LDAP_CALL *t_ldap_get_dn)( LDAP *ld, LDAPMessage *entry );
+typedef LDAP_API(LDAPMessage *) (LDAP_CALL *t_ldap_first_entry)( LDAP *ld,  LDAPMessage *chain );
+typedef LDAP_API(int) (LDAP_CALL *t_ldap_search_s)( LDAP *ld, const char *base, int scope,  const char *filter, char **attrs, int attrsonly, LDAPMessage **res );
+typedef LDAP_API(void) (LDAP_CALL *t_ldap_value_free)( char **vals );
+typedef LDAP_API(char **) (LDAP_CALL *t_ldap_get_values)( LDAP *ld, LDAPMessage *entry, const char *target );
+typedef LDAP_API(void) (LDAP_CALL *t_ldap_memfree)( void *p );
 //------------------------------------------------------------------------------
 /** Struct containing the information on LDAP connection */
 struct LdapDefinition
@@ -75,6 +86,7 @@ struct LdapDefinition
 /** Class encapulating all LDAP functionality */
 class LdapConnection
 {
+    friend struct LdapMessageHolder;
 public:
 
     /** Default constructor */
@@ -124,6 +136,12 @@ public:
         throw (lang::IllegalArgumentException,
                 ldap::LdapConnectionException,
                 ldap::LdapGenericException);
+
+    void loadModule();
+
+    static t_ldap_err2string        s_p_err2string;
+    static t_ldap_value_free        s_p_value_free;
+    static t_ldap_get_values        s_p_get_values;
 private:
 
     void initConnection()
@@ -142,6 +160,19 @@ private:
     /** LDAP connection object */
     LDAP* mConnection ;
     LdapDefinition mLdapDefinition;
+
+    static oslModule                s_Ldap_Module;
+    static t_ldap_unbind_s          s_p_unbind_s;
+    static t_ldap_simple_bind_s     s_p_simple_bind_s;
+    static t_ldap_set_option        s_p_set_option;
+    static t_ldap_init              s_p_init;
+    static t_ldap_msgfree           s_p_msgfree;
+    static t_ldap_get_dn            s_p_get_dn;
+    static t_ldap_first_entry       s_p_first_entry;
+    static t_ldap_search_s          s_p_search_s;
+
+    static t_ldap_memfree           s_p_memfree;
+
 } ;
 //------------------------------------------------------------------------------
 }} }
diff --git a/extensions/source/config/ldap/ldapuserprof.cxx b/extensions/source/config/ldap/ldapuserprof.cxx
index 7475af4e8fcf..3a031ddae211 100644
--- a/extensions/source/config/ldap/ldapuserprof.cxx
+++ b/extensions/source/config/ldap/ldapuserprof.cxx
@@ -31,7 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 #include "ldapuserprof.hxx"
-
+#include "ldapaccess.hxx"
 namespace extensions { namespace config { namespace ldap {
 //==============================================================================
 
@@ -127,14 +127,14 @@ void LdapUserProfileMap::ldapToUserProfile(LDAP *aConnection,
         for (sal_uInt32 j = 0 ;
                 j < mMapping [i].mLdapAttributes.size() ; ++ j)
         {
-            values = ldap_get_values(aConnection, aEntry,
+            values = (*LdapConnection::s_p_get_values)(aConnection, aEntry,
                                      mMapping [i].mLdapAttributes [j]) ;
 
             if (values != NULL)
             {
                 aProfile.mProfile[i].mValue = rtl::OStringToOUString(
                     *values, RTL_TEXTENCODING_UTF8);
-                ldap_value_free(values);
+                (*LdapConnection::s_p_value_free)(values);
                 break;
             }
         }
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index 13cd3ff2070d..330834c5b414 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -112,27 +112,30 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
         OSL_ENSURE(!bReentrantCall, "configuration: Ldap Backend constructor called reentrantly - probably a registration error.");
 
         if (!bReentrantCall)
-        try
         {
-            bReentrantCall = true ;
-            if (! readLdapConfiguration(aDefinition) )
+            try
             {
-                throw backend::BackendSetupException(
-                    rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),
-                    NULL, uno::Any());
+                bReentrantCall = true ;
+                if (! readLdapConfiguration(aDefinition) )
+                {
+                    throw backend::BackendSetupException(
+                        rtl::OUString::createFromAscii("LdapUserProfileBe- LDAP not configured"),
+                        NULL, uno::Any());
+                }
+
+                bReentrantCall = false ;
+            }
+            catch (uno::Exception&)
+            {
+                bReentrantCall = false;
+                throw;
             }
-
-            bReentrantCall = false ;
-        }
-        catch (uno::Exception&)
-        {
-            bReentrantCall = false;
-            throw;
         }
     }
 
     try
     {
+        mLdapSource->mConnection.loadModule();
         mLdapSource->mConnection.connectSimple(aDefinition);
         //Set the UserDN
         mUserDN = mLdapSource->mConnection.findUserDn(
diff --git a/extensions/source/config/ldap/makefile.mk b/extensions/source/config/ldap/makefile.mk
index acd47ab9e281..5ff3da4d21de 100644
--- a/extensions/source/config/ldap/makefile.mk
+++ b/extensions/source/config/ldap/makefile.mk
@@ -82,7 +82,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=$(LIB1TARGET)
 SHL1IMPLIB=i$(SHL1TARGET)
 SHL1STDLIBS=    \
-        $(LDAPSDKLIB) \
         $(CPPUHELPERLIB) \
         $(CPPULIB) \
         $(SALHELPERLIB) \
diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
index 4c1bbdc350f8..b3b8d45e94d7 100644
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ b/extensions/source/config/ldap/wrapldapinclude.hxx
@@ -35,6 +35,12 @@
 
 #ifdef WITH_OPENLDAP
 #include <ldap.h>
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
 #else
 #ifndef LDAP_INCLUDED
 #define LDAP_INCLUDED
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 7b36f27626c4..f86b284b72fd 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -223,9 +223,6 @@ namespace dbp
 
             // the bound field
             getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField)));
-
-            // by default, create a drop down control
-            getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("Dropdown"), ::cppu::bool2any(sal_True));
         }
         catch(Exception&)
         {
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index 2addf2f037a7..255d66f46ea8 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -32,8 +32,10 @@
 #define __OLEOBJW_HXX
 #include "ole2uno.hxx"
 
+#ifdef _MSC_VER
 #pragma warning (push,1)
 #pragma warning (disable:4548)
+#endif
 
 #include <tools/presys.h>
 #define _WIN32_WINNT 0x0400
@@ -46,7 +48,9 @@
 #include <hash_map>
 #include <tools/postsys.h>
 
+#ifdef _MSC_VER
 #pragma warning (pop)
+#endif
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
 
@@ -88,7 +92,7 @@ public:
     ~IUnknownWrapper_Impl();
 
     //XInterface
-    Any SAL_CALL IUnknownWrapper_Impl::queryInterface(const Type& t)
+    Any SAL_CALL queryInterface(const Type& t)
         throw (RuntimeException);
 
     // XInvokation
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk
index 53de4e333994..b527f16bf44e 100644
--- a/extensions/source/oooimprovecore/makefile.mk
+++ b/extensions/source/oooimprovecore/makefile.mk
@@ -52,6 +52,9 @@ LIB1FILES= \
         $(SLB)$/$(TARGET).lib \
 
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+.IF "$(GUI)"=="OS2"
+SHL1TARGET=oooimpc$(DLLPOSTFIX)
+.ENDIF
 
 SHL1STDLIBS= \
         $(COMPHELPERLIB) \
@@ -62,6 +65,7 @@ SHL1STDLIBS= \
         $(SVLLIB) \
         $(SVTOOLLIB) \
         $(SFXLIB) \
+        $(SVXCORELIB) \
         $(SVXLIB) \
         $(TOOLSLIB)
 
diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx
index daf1e81bc60d..bece7e089f1a 100644
--- a/extensions/source/oooimprovement/config.cxx
+++ b/extensions/source/oooimprovement/config.cxx
@@ -222,6 +222,7 @@ namespace oooimprovement
         return result;
     }
 
+#ifdef FUTURE
     sal_Int32 Config::getFailedAttempts() const
     {
         sal_Int32 result = 0;
@@ -231,6 +232,7 @@ namespace oooimprovement
             MyConfigurationHelper::E_READONLY) >>= result;
         return result;
     }
+#endif
 
     sal_Int32 Config::getOfficeStartCounterdown() const
     {
diff --git a/extensions/source/oooimprovement/config.hxx b/extensions/source/oooimprovement/config.hxx
index ff032a6032a5..c5ea887fa76f 100644
--- a/extensions/source/oooimprovement/config.hxx
+++ b/extensions/source/oooimprovement/config.hxx
@@ -53,7 +53,9 @@ namespace oooimprovement
             ::rtl::OUString getSoapId() const;
             ::rtl::OUString getSoapUrl() const;
             sal_Int32 getReportCount() const;
+#ifdef FUTURE
             sal_Int32 getFailedAttempts() const;
+#endif
             sal_Int32 getOfficeStartCounterdown() const;
             sal_Int32 incrementEventCount(sal_Int32 by);
             sal_Int32 incrementReportCount(sal_Int32 by);
diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx
index 34fc24e42302..3c9245d3faa9 100644
--- a/extensions/source/oooimprovement/corecontroller.cxx
+++ b/extensions/source/oooimprovement/corecontroller.cxx
@@ -33,7 +33,6 @@
 #include "corecontroller.hxx"
 #include "config.hxx"
 
-
 using ::rtl::OUString;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -41,14 +40,6 @@ using namespace ::com::sun::star::uno;
 
 namespace oooimprovement
 {
-
-    CoreController::CoreController(const Reference<XComponentContext>& context)
-        : m_ServiceFactory(Reference<XMultiServiceFactory>(
-            context->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-            UNO_QUERY))
-    { }
-
     CoreController::CoreController(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
     { }
@@ -96,9 +87,6 @@ namespace oooimprovement
         return aServiceNames;
     }
 
-    Reference<XInterface> SAL_CALL CoreController::Create(const Reference<XComponentContext>& context)
-    { return *(new CoreController(context)); }
-
     Reference<XInterface> SAL_CALL CoreController::Create(const Reference<XMultiServiceFactory>& sm)
     { return *(new CoreController(sm)); }
 }
diff --git a/extensions/source/oooimprovement/corecontroller.hxx b/extensions/source/oooimprovement/corecontroller.hxx
index 3f1cadb82b69..4f62e9d026b6 100644
--- a/extensions/source/oooimprovement/corecontroller.hxx
+++ b/extensions/source/oooimprovement/corecontroller.hxx
@@ -54,8 +54,8 @@ namespace oooimprovement
             // css::lang::XServiceInfo - static version
             static ::rtl::OUString SAL_CALL getImplementationName_static();
             static css::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames_static();
-            static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
-                const css::uno::Reference<css::uno::XComponentContext>& context);
+            //static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
+            //    const css::uno::Reference<css::uno::XComponentContext>& context);
 
             static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
                 const css::uno::Reference< css::lang::XMultiServiceFactory>& sm);
diff --git a/extensions/source/oooimprovement/errormail.cxx b/extensions/source/oooimprovement/errormail.cxx
index fdfec120695f..38e863750220 100644
--- a/extensions/source/oooimprovement/errormail.cxx
+++ b/extensions/source/oooimprovement/errormail.cxx
@@ -37,7 +37,7 @@
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
 
-#ifdef UNIX
+#if defined(UNIX) || defined(OS2)
     #include <sys/utsname.h>
 #endif
 #ifdef WIN32
@@ -83,12 +83,14 @@ namespace {
             return "Win32";
         #elif defined UNIX
             return "Unix";
+        #elif defined OS2
+            return "OS/2";
         #else
             return "Unknown";
         #endif
     };
 
-#ifdef UNIX
+#if defined(UNIX) || defined(OS2)
     static const OString getLocale()
     {
         const char * locale = getenv( "LC_ALL" );
diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 20efafcaa69a..bb1ce11d23fe 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -67,12 +67,12 @@ namespace
 
 namespace oooimprovement
 {
-    InviteJob::InviteJob(const Reference<XComponentContext>& context)
-        : m_ServiceFactory(Reference<XMultiServiceFactory>(
-            context->getServiceManager()->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
-            UNO_QUERY))
-    { }
+//    InviteJob::InviteJob(const Reference<XComponentContext>& context)
+//        : m_ServiceFactory(Reference<XMultiServiceFactory>(
+//            context->getServiceManager()->createInstanceWithContext(
+//                OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context),
+//            UNO_QUERY))
+//    { }
 
     InviteJob::InviteJob(const Reference<XMultiServiceFactory>& sf)
         : m_ServiceFactory(sf)
@@ -128,8 +128,8 @@ namespace oooimprovement
         return aServiceNames;
     }
 
-    Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
-    { return *(new InviteJob(context)); }
+//    Reference<XInterface> InviteJob::Create(const Reference<XComponentContext>& context)
+//    { return *(new InviteJob(context)); }
 
     Reference<XInterface> InviteJob::Create(const Reference<XMultiServiceFactory>& sm)
     { return *(new InviteJob(sm)); }
diff --git a/extensions/source/oooimprovement/invite_job.hxx b/extensions/source/oooimprovement/invite_job.hxx
index 17e5c2586003..8c1cd57f07a8 100644
--- a/extensions/source/oooimprovement/invite_job.hxx
+++ b/extensions/source/oooimprovement/invite_job.hxx
@@ -53,8 +53,8 @@ namespace oooimprovement
             // XServiceInfo - static version
             static ::rtl::OUString SAL_CALL getImplementationName_static();
             static css::uno::Sequence< ::rtl::OUString> SAL_CALL getSupportedServiceNames_static();
-            static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
-                const css::uno::Reference< css::uno::XComponentContext>& context);
+            //static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(
+            //    const css::uno::Reference< css::uno::XComponentContext>& context);
 
             static css::uno::Reference< css::uno::XInterface> SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory>& sm);
 
diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk
index 41f91fc7b5ca..f9b508b13f2f 100644
--- a/extensions/source/oooimprovement/makefile.mk
+++ b/extensions/source/oooimprovement/makefile.mk
@@ -70,6 +70,10 @@ SHL1STDLIBS= \
         $(UNOTOOLSLIB) \
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
+.IF "$(GUI)"=="OS2"
+SHL1TARGET= oooimp$(DLLPOSTFIX)
+.ENDIF
+
 SHL1LIBS= $(SLB)$/$(TARGET).lib
 SHL1DEF= $(MISC)$/$(SHL1TARGET).def
 DEF1NAME= $(SHL1TARGET)
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx
index c6e68e92a064..e0f14c6ec445 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.cxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx
@@ -149,33 +149,6 @@ namespace oooimprovement
         xProps->setPropertyValue(sKey, aValue);
     }
 
-    Reference<XInterface> MyConfigurationHelper::makeSureSetNodeExists(
-        const Reference<XInterface> xCFG,
-        const OUString& sRelPathToSet,
-        const OUString& sSetNode)
-    {
-        Reference<css::container::XHierarchicalNameAccess> xAccess(xCFG, UNO_QUERY_THROW);
-        Reference<css::container::XNameAccess> xSet;
-        xAccess->getByHierarchicalName(sRelPathToSet) >>= xSet;
-        if (!xSet.is())
-            throw css::container::NoSuchElementException(
-                noSuchElement(sRelPathToSet),
-                Reference<XInterface>());
-
-        Reference<XInterface> xNode;
-        if (xSet->hasByName(sSetNode))
-            xSet->getByName(sSetNode) >>= xNode;
-        else
-        {
-            Reference<XSingleServiceFactory> xNodeFactory(xSet, UNO_QUERY_THROW);
-            xNode = xNodeFactory->createInstance();
-            Reference<css::container::XNameContainer> xSetReplace(xSet, UNO_QUERY_THROW);
-            xSetReplace->insertByName(sSetNode, makeAny(xNode));
-        }
-
-        return xNode;
-    }
-
     Any MyConfigurationHelper::readDirectKey(
         const Reference<XMultiServiceFactory> xSMGR,
         const OUString& sPackage,
diff --git a/extensions/source/oooimprovement/myconfigurationhelper.hxx b/extensions/source/oooimprovement/myconfigurationhelper.hxx
index a5d0c749e81a..5c5cb38b6a68 100644
--- a/extensions/source/oooimprovement/myconfigurationhelper.hxx
+++ b/extensions/source/oooimprovement/myconfigurationhelper.hxx
@@ -163,40 +163,6 @@ namespace oooimprovement
             const css::uno::Any& aValue);
 
         //-----------------------------------------------
-        /** it checks if the specified set node exists ... or create an empty one
-         *  otherwise.
-         *
-         *  This method must be used in combination with openConfig().
-         *  The cached configuration access must be provided here ... and
-         *  all operations are made relativ to this access point.
-         *
-         *  Further this method must be used only with configuration set's.
-         *  Atomic keys can't be "created" ... they "exists everytimes".
-         *
-         *  @param  xCFG
-         *          the configuration root, where sRelPathToSet should be interpreted
-         *          as relativ path.
-         *
-         *  @param  sRelPathToSet
-         *          path relative to xCFG parameter.
-         *
-         *  @param  sSetNode
-         *          the set node, which should be checked if its exists ...
-         *          or which should be created with default values.
-         *
-         *  @return A reference to the found (or new created) set node.
-         *          Cant be NULL .. in such case an exception occure !
-         *
-         *  @throw  css::uno::Any exceptions the underlying configuration can throw.
-         *          E.g. css::uno::Exception if the provided configuration
-         *          access does not allow writing for this set.
-         */
-        static css::uno::Reference< css::uno::XInterface> makeSureSetNodeExists(
-            const css::uno::Reference< css::uno::XInterface> xCFG,
-            const ::rtl::OUString& sRelPathToSet,
-            const ::rtl::OUString& sSetNode);
-
-        //-----------------------------------------------
         /** commit all changes made on the specified configuration access.
          *
          *  This method must be used in combination with openConfig().
diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx
index d67ce911d204..045a02701fc6 100644
--- a/extensions/source/oooimprovement/soaprequest.cxx
+++ b/extensions/source/oooimprovement/soaprequest.cxx
@@ -33,6 +33,7 @@
 
 #include "soaprequest.hxx"
 #include "errormail.hxx"
+#include "config.hxx"
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -56,7 +57,7 @@ namespace
 {
     static unsigned long asUlong(sal_Int8 input)
     {
-        return *reinterpret_cast<unsigned char *>(&input) ;
+        return *reinterpret_cast<unsigned char *>(&input);
     };
 
     static Sequence<sal_Int8> base64_encode(const Sequence<sal_Int8>& input)
@@ -150,10 +151,18 @@ namespace
         "</SOAP-ENV:Envelope>\n");
     static const OString SOAP_ITEM_END("]]></value></item>\n");
 
-    static const OString getSoapSoapId(const OString& soap_id)
+    static const OString getSoapOfficeversion(const Reference<XMultiServiceFactory>& sf)
     {
-        OStringBuffer buf =
-            "<body xsi:type=\"xsd:string\">" + xmlEncode(soap_id) + "</body>\n";
+        return ::rtl::OUStringToOString(oooimprovement::Config(sf).getCompleteProductname(), RTL_TEXTENCODING_ASCII_US);
+    };
+
+    static const OString getSoapSoapId(const Reference<XMultiServiceFactory>& sf, const OString& soap_id)
+    {
+        OStringBuffer buf;
+        buf.append("<body xsi:type=\"xsd:string\">");
+        buf.append(xmlEncode(soap_id)).append("\n");
+        buf.append(xmlEncode(getSoapOfficeversion(sf))).append("\n");
+        buf.append("</body>\n");
         return buf.makeStringAndClear();
     };
 
@@ -180,7 +189,7 @@ namespace oooimprovement
         writeString(target, SOAP_START);
             writeString(
                 target,
-                getSoapSoapId(rtl::OUStringToOString(m_SoapId, RTL_TEXTENCODING_ASCII_US)));
+                getSoapSoapId(m_ServiceFactory, rtl::OUStringToOString(m_SoapId, RTL_TEXTENCODING_ASCII_US)));
             writeString(target, SOAP_ITEMS_START);
                 writeString(target, getSoapItemStart("reportmail.xml"));
                     writeString(target, Errormail(m_ServiceFactory).getXml());
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index 26df705a1d97..65a56f03f7ad 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -400,12 +400,56 @@ static int parseMimeResource( CFBundleRef i_xBundle,
     return nAdded;
 }
 
+// check some known bad plugins to avoid crashes
+static bool checkBlackList( CFBundleRef i_xBundle )
+{
+    rtl::OUString aBundleName;
+    CFTypeRef bundlename = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("CFBundleName"));
+    if( bundlename && CFGetTypeID(bundlename) == CFStringGetTypeID() )
+        aBundleName = getString( static_cast<CFStringRef>(bundlename) );
+
+    rtl::OUString aBundleVersion;
+    CFTypeRef bundleversion = CFBundleGetValueForInfoDictionaryKey( i_xBundle, CFSTR("CFBundleVersion"));
+    if( bundleversion && CFGetTypeID(bundleversion) == CFStringGetTypeID() )
+        aBundleVersion = getString( static_cast<CFStringRef>(bundleversion) );
+
+    bool bReject = false;
+    // #i102735# VLC plugin prior to 1.0 tends to crash
+    if( aBundleName.equalsAscii( "VLC Plug-in" ) )
+    {
+        sal_Int32 nIndex = 0;
+        rtl::OUString aMajor( aBundleVersion.getToken( 0, '.', nIndex ) );
+        if( aMajor.toInt32() < 1 )
+        {
+            bReject = true;
+        }
+    }
+    // #i103674# Garmin Communicator Plugin crashes
+    else if( aBundleName.equalsAscii( "Garmin Communicator Plugin" ) )
+    {
+        bReject = true;
+    }
+
+    #if OSL_DEBUG_LEVEL > 1
+    if( bReject )
+        fprintf( stderr, "rejecting plugin \"%s\" version %s\n",
+                 rtl::OUStringToOString( aBundleName, RTL_TEXTENCODING_UTF8 ).getStr(),
+                 rtl::OUStringToOString( aBundleVersion, RTL_TEXTENCODING_UTF8 ).getStr()
+                 );
+    #endif
+
+    return bReject;
+}
+
 static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescription* >& io_rDescriptions )
 {
     int nDescriptions = 0;
     if( ! i_xBundle )
         return nDescriptions;
 
+    if( checkBlackList( i_xBundle ) )
+        return 0;
+
     rtl::OUString aPlugURL;
     CFURLRef xURL = CFBundleCopyBundleURL( i_xBundle );
     aPlugURL = getString( xURL );
@@ -424,7 +468,8 @@ static int getPluginDescriptions( CFBundleRef i_xBundle , list< PluginDescriptio
     fprintf( stderr, "URL: %s\nname: %s\ndescription: %s\n",
         rtl::OUStringToOString( aPlugURL, RTL_TEXTENCODING_UTF8 ).getStr(),
         rtl::OUStringToOString( aPlugName, RTL_TEXTENCODING_UTF8 ).getStr(),
-        rtl::OUStringToOString( aPlugDescription, RTL_TEXTENCODING_UTF8 ).getStr() );
+        rtl::OUStringToOString( aPlugDescription, RTL_TEXTENCODING_UTF8 ).getStr()
+        );
     #endif
 
 
@@ -535,7 +580,7 @@ static rtl::OUString FindFolderURL(  FSVolumeRefNum vRefNum, OSType folderType )
     return aRet;
 }
 
-Sequence<PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw()
+Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
 {
     static Sequence<PluginDescription> aDescriptions;
     static BOOL bHavePlugins = FALSE;
diff --git a/extensions/source/plugin/aqua/makefile.mk b/extensions/source/plugin/aqua/makefile.mk
index b68ee9f73f93..9cbe83809d11 100644
--- a/extensions/source/plugin/aqua/makefile.mk
+++ b/extensions/source/plugin/aqua/makefile.mk
@@ -55,7 +55,6 @@ CDEFS+=-DOJI
 .ENDIF
 
 .IF "$(GUIBASE)"=="aqua"
-OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
 CFLAGSCXX+=$(OBJCXXFLAGS)
 .ENDIF  # "$(GUIBASE)"=="aqua"
 
diff --git a/extensions/source/plugin/base/makefile.mk b/extensions/source/plugin/base/makefile.mk
index f25f8fb47679..1e0a39b663e6 100644
--- a/extensions/source/plugin/base/makefile.mk
+++ b/extensions/source/plugin/base/makefile.mk
@@ -51,7 +51,6 @@ CDEFS+=-DDISABLE_XAW
 .IF "$(WITH_MOZILLA)" != "NO"
 
 .IF "$(GUIBASE)"=="aqua"
-OBJCXXFLAGS=-x objective-c++ -fobjc-exceptions
 CFLAGSCXX+=$(OBJCXXFLAGS)
 .ENDIF  # "$(GUIBASE)"=="aqua"
 
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 92fca1211caa..bb5422c69a51 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -35,19 +35,19 @@
 #include <cstdarg>
 #endif
 
-#include <plugin/impl.hxx>
+#include "plugin/impl.hxx"
 
-#ifndef _OSL_MUTEX_HXX
-#include <osl/mutex.hxx>
-#endif
-#include <svtools/pathoptions.hxx>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XElementAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/loader/XImplementationLoader.hpp>
-#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
+#include "osl/mutex.hxx"
+#include "svtools/pathoptions.hxx"
+#include "vcl/configsettings.hxx"
+
+#include "com/sun/star/container/XEnumerationAccess.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XElementAccess.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/loader/XImplementationLoader.hpp"
+#include "com/sun/star/loader/CannotActivateFactoryException.hpp"
 
 PluginManager* PluginManager::pManager = NULL;
 
@@ -165,6 +165,20 @@ XPlugin_Impl* XPluginManager_Impl::getPluginImplementation( const Reference< ::c
     return NULL;
 }
 
+Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw()
+{
+    Sequence<com::sun::star::plugin::PluginDescription> aRet;
+
+    vcl::SettingsConfigItem* pCfg = vcl::SettingsConfigItem::get();
+    rtl::OUString aVal( pCfg->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BrowserPlugins" ) ),
+                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Disabled" ) ) ) );
+    if( ! aVal.toBoolean() )
+    {
+        aRet = impl_getPluginDescriptions();
+    }
+    return aRet;
+}
+
 Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, INT16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype)
     throw( RuntimeException,::com::sun::star::plugin::PluginException )
 {
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index 28524770521c..e9adee5088dd 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -293,6 +293,9 @@ public:
     virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw();
 
     // has to be implemented per system
+    virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions(void) throw();
+    // calls system specific impl_getPluginDescriptions
+    // checks whether plugins are disabled
     virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw();
 
     virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< rtl::OUString >& argn, const Sequence< rtl::OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException );
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 5f0e639e1c7e..862075d92c28 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -67,7 +67,9 @@ extern "C" {
 #  endif
 #endif
 #include <X11/Xatom.h>
-#define XP_UNIX
+#ifndef XP_UNIX
+#    define XP_UNIX
+#endif
 #define MOZ_X11
 #include <stdio.h>
 #ifdef SYSTEM_MOZILLA
@@ -102,7 +104,7 @@ extern "C" {
 extern "C" {
 #include <npsdk/npupp.h>
 }
-#include <npapi.h>
+#include <npsdk/npapi.h>
 
 #if NP_VERSION_MINOR < 17
 // compatibility hack: compile with older NPN api header, but define
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index ff17d1e24324..1f1d291daf8d 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -226,7 +226,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
         closedir( pDIR );
 }
 
-Sequence<PluginDescription> XPluginManager_Impl::getPluginDescriptions() throw()
+Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
 {
     static Sequence<PluginDescription> aDescriptions;
     static BOOL bHavePlugins = FALSE;
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 657992ec1b33..dfba6a755201 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -96,8 +96,8 @@ SHL1STDLIBS+= \
     $(CPPULIB)			\
     $(SALLIB)
 
-.IF "$(OS)"=="MACOSX" && "$(GUIBASE)"=="unx"
-SHL1STDLIBS+= -lX11
+.IF "$(GUIBASE)"=="unx"
+SHL1STDLIBS+=$(X11LINK_DYNAMIC)
 .ENDIF
 
 SHL1STDLIBS+=$(SHL1OWNLIBS)
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 6a63ad8b5402..caf7a38a5458 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -325,7 +325,7 @@ static void add_SO_Plugins( PluginLocationMap & rPlugins )
 }
 
 //__________________________________________________________________________________________________
-Sequence< PluginDescription > XPluginManager_Impl::getPluginDescriptions(void) throw()
+Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(void) throw()
 {
     Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
     static Sequence<PluginDescription > s_aDescriptions( 0 );
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 23008fc9a1de..bd60181f1d0e 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1244,14 +1244,74 @@ namespace pcr
     }
 
     //------------------------------------------------------------------
+    long OBrowserListBox::PreNotify( NotifyEvent& _rNEvt )
+    {
+        switch ( _rNEvt.GetType() )
+        {
+        case EVENT_KEYINPUT:
+        {
+            const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
+            if  (   ( pKeyEvent->GetKeyCode().GetModifier() != 0 )
+                ||  (   ( pKeyEvent->GetKeyCode().GetCode() != KEY_PAGEUP )
+                    &&  ( pKeyEvent->GetKeyCode().GetCode() != KEY_PAGEDOWN )
+                    )
+                )
+                break;
+
+            long nScrollOffset = 0;
+            if ( m_aVScroll.IsVisible() )
+            {
+                if ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEUP )
+                    nScrollOffset = -m_aVScroll.GetPageSize();
+                else if ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEDOWN )
+                    nScrollOffset = m_aVScroll.GetPageSize();
+            }
+
+            if ( nScrollOffset )
+            {
+                long nNewThumbPos = m_aVScroll.GetThumbPos() + nScrollOffset;
+                nNewThumbPos = ::std::max( nNewThumbPos, m_aVScroll.GetRangeMin() );
+                nNewThumbPos = ::std::min( nNewThumbPos, m_aVScroll.GetRangeMax() );
+                m_aVScroll.DoScroll( nNewThumbPos );
+                nNewThumbPos = m_aVScroll.GetThumbPos();
+
+                sal_uInt16 nFocusControlPos = 0;
+                sal_uInt16 nActiveControlPos = impl_getControlPos( m_xActiveControl );
+                if ( nActiveControlPos < nNewThumbPos )
+                    nFocusControlPos = (sal_uInt16)nNewThumbPos;
+                else if ( nActiveControlPos >= nNewThumbPos + CalcVisibleLines() )
+                    nFocusControlPos = (sal_uInt16)nNewThumbPos + CalcVisibleLines() - 1;
+                if ( nFocusControlPos )
+                {
+                    if ( nFocusControlPos < m_aOrderedLines.size() )
+                    {
+                        m_aOrderedLines[ nFocusControlPos ]->second.pLine->GrabFocus();
+                    }
+                    else
+                        OSL_ENSURE( false, "OBrowserListBox::PreNotify: internal error, invalid focus control position!" );
+                }
+            }
+
+            return 1L;
+            // handled this. In particular, we also consume PageUp/Down events if we do not use them for scrolling,
+            // otherwise they would be used to scroll the document view, which does not sound like it is desired by
+            // the user.
+        }
+        }
+        return Control::PreNotify( _rNEvt );
+    }
+
+    //------------------------------------------------------------------
     long OBrowserListBox::Notify( NotifyEvent& _rNEvt )
     {
-        if ( EVENT_COMMAND == _rNEvt.GetType() )
+        switch ( _rNEvt.GetType() )
+        {
+        case EVENT_COMMAND:
         {
             const CommandEvent* pCommand = _rNEvt.GetCommandEvent();
             if  (   ( COMMAND_WHEEL == pCommand->GetCommand() )
-                    ||  ( COMMAND_STARTAUTOSCROLL == pCommand->GetCommand() )
-                    ||  ( COMMAND_AUTOSCROLL == pCommand->GetCommand() )
+                ||  ( COMMAND_STARTAUTOSCROLL == pCommand->GetCommand() )
+                ||  ( COMMAND_AUTOSCROLL == pCommand->GetCommand() )
                 )
             {
                 // interested in scroll events if we have a scrollbar
@@ -1261,6 +1321,9 @@ namespace pcr
                 }
             }
         }
+        break;
+        }
+
         return Control::Notify( _rNEvt );
     }
 
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index a89e1dc83c39..46ae1f94aaa8 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -149,6 +149,7 @@ namespace pcr
         void                        EnableUpdate();
         void                        DisableUpdate();
         long                        Notify( NotifyEvent& _rNEvt );
+        long                        PreNotify( NotifyEvent& _rNEvt );
 
         void                        SetListener( IPropertyLineListener* _pListener );
         void                        SetObserver( IPropertyControlObserver* _pObserver );
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index d0ac0de3857a..b200d37cb83b 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -412,6 +412,18 @@ namespace pcr
     }
 
     //--------------------------------------------------------------------
+    Sequence< ::rtl::OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
+    {
+        ::osl::MutexGuard aGuard( m_aMutex );
+        if ( !m_pHelper.get() )
+            return Sequence< ::rtl::OUString >();
+
+        Sequence< ::rtl::OUString > aReturn( 1 );
+        aReturn[ 0 ] = PROPERTY_INPUT_REQUIRED;
+        return aReturn;
+    }
+
+    //--------------------------------------------------------------------
     LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 700cf43431cf..55c464d77076 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -77,6 +77,8 @@ namespace pcr
         virtual void                                SAL_CALL setPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
                                                     SAL_CALL getActuatingProperties( ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+                                                    SAL_CALL getSupersededProperties( ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::inspection::LineDescriptor
                                                     SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::inspection::InteractiveSelectionResult
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 4d7c09563b5d..05d0984349b4 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -53,6 +53,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
+#include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XFormController.hpp>
 #include <com/sun/star/inspection/PropertyControlType.hpp>
@@ -146,6 +147,7 @@ namespace pcr
     /** === end UNO using === **/
     namespace PropertyControlType = ::com::sun::star::inspection::PropertyControlType;
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
+    namespace FormComponentType = ::com::sun::star::form::FormComponentType;
 
     //====================================================================
     //= EventDescription
@@ -538,6 +540,7 @@ namespace pcr
         ,m_aPropertyListeners( m_aMutex )
         ,m_bEventsMapInitialized( false )
         ,m_bIsDialogElement( false )
+        ,m_nGridColumnType( -1 )
     {
         DBG_CTOR( EventHandler, NULL );
     }
@@ -602,6 +605,7 @@ namespace pcr
         m_aEvents.swap( aEmpty );
 
         m_bIsDialogElement = false;
+        m_nGridColumnType = -1;
         try
         {
             Reference< XPropertySetInfo > xPSI( m_xComponent->getPropertySetInfo() );
@@ -610,6 +614,15 @@ namespace pcr
                               && xPSI->hasPropertyByName( PROPERTY_HEIGHT )
                               && xPSI->hasPropertyByName( PROPERTY_POSITIONX )
                               && xPSI->hasPropertyByName( PROPERTY_POSITIONY );
+
+            Reference< XChild > xAsChild( _rxIntrospectee, UNO_QUERY );
+            if ( xAsChild.is() && !Reference< XForm >( _rxIntrospectee, UNO_QUERY ).is() )
+            {
+                if ( FormComponentType::GRIDCONTROL == classifyComponent( xAsChild->getParent() ) )
+                {
+                    m_nGridColumnType = classifyComponent( _rxIntrospectee );
+                }
+            }
         }
         catch( const Exception& )
         {
@@ -827,12 +840,15 @@ namespace pcr
                     const ::rtl::OUString* pMethods = aMethods.getConstArray();
                     sal_uInt32 methodCount = aMethods.getLength();
 
-                    for (sal_uInt32 method = 0 ; method < methodCount ; method++,++pMethods )
+                    for (sal_uInt32 method = 0 ; method < methodCount ; ++method, ++pMethods )
                     {
                         EventDescription aEvent;
                         if ( !lcl_getEventDescriptionForMethod( *pMethods, aEvent ) )
                             continue;
 
+                        if ( !impl_filterMethod_nothrow( aEvent ) )
+                            continue;
+
                         const_cast< EventHandler* >( this )->m_aEvents.insert( EventMap::value_type(
                             lcl_getEventPropertyName( sListenerClassName, *pMethods ), aEvent ) );
                     }
@@ -1272,6 +1288,29 @@ namespace pcr
         }
     }
 
+    //--------------------------------------------------------------------
+    bool EventHandler::impl_filterMethod_nothrow( const EventDescription& _rEvent ) const
+    {
+        // some (control-triggered) events do not make sense for certain grid control columns. However,
+        // our mechnism to retrieve control-triggered events does not know about this, so we do some
+        // late filtering here.
+        switch ( m_nGridColumnType )
+        {
+        case FormComponentType::COMBOBOX:
+            if ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId )
+                return false;
+            break;
+        case FormComponentType::LISTBOX:
+            if  (   ( UID_BRWEVT_CHANGED == _rEvent.nUniqueBrowseId )
+                ||  ( UID_BRWEVT_ACTIONPERFORMED == _rEvent.nUniqueBrowseId )
+                )
+                return false;
+            break;
+        }
+
+        return true;
+    }
+
 //........................................................................
 } // namespace pcr
 //........................................................................
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index a68fe100afb4..dcb70f8fd2b3 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -107,6 +107,8 @@ namespace pcr
         /// is our introspectee a dialog element?
         bool                                                                        m_bIsDialogElement;
             // TODO: move different handling into different derived classes?
+        /// (FormComponent) type of the grid column being inspected, or -1 if we're not inspecting a grid column
+        sal_Int16                                                                   m_nGridColumnType;
 
     public:
         // XServiceInfo - static versions
@@ -248,6 +250,12 @@ namespace pcr
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >
                 impl_getContextFrame_nothrow() const;
 
+        /** approves or denies a certain method to be included in the UI
+            @return
+                <TRUE/> if and only if the given method is allowed.
+        */
+        bool    impl_filterMethod_nothrow( const EventDescription& _rEvent ) const;
+
     private:
         EventHandler();                                 // never implemented
         EventHandler( const EventHandler& );            // never implemented
diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx
index 898a618f53a0..ccce47a7346d 100644
--- a/extensions/source/propctrlr/formbrowsertools.cxx
+++ b/extensions/source/propctrlr/formbrowsertools.cxx
@@ -53,6 +53,7 @@ namespace pcr
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
 
+    //------------------------------------------------------------------------
     ::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
     {
         PcrClient aResourceAccess;
@@ -130,6 +131,20 @@ namespace pcr
         return sClassName;
     }
 
+    //------------------------------------------------------------------------
+    sal_Int16 classifyComponent( const Reference< XInterface >& _rxComponent )
+    {
+        Reference< XPropertySet > xComponentProps( _rxComponent, UNO_QUERY_THROW );
+        Reference< XPropertySetInfo > xPSI( xComponentProps->getPropertySetInfo(), UNO_SET_THROW );
+
+        sal_Int16 nControlType( FormComponentType::CONTROL );
+        if ( xPSI->hasPropertyByName( PROPERTY_CLASSID ) )
+        {
+            OSL_VERIFY( xComponentProps->getPropertyValue( PROPERTY_CLASSID ) >>= nControlType );
+        }
+        return nControlType;
+    }
+
 //............................................................................
 } // namespace pcr
 //............................................................................
diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx
index 6fb0c732ea1f..760aa9cb6d42 100644
--- a/extensions/source/propctrlr/formbrowsertools.hxx
+++ b/extensions/source/propctrlr/formbrowsertools.hxx
@@ -44,6 +44,7 @@ namespace pcr
 //............................................................................
 
     ::rtl::OUString GetUIHeadlineName(sal_Int16 _nClassId, const ::com::sun::star::uno::Any& _rUnoObject);
+    sal_Int16 classifyComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent );
 
     //========================================================================
     struct FindPropertyByHandle : public ::std::unary_function< ::com::sun::star::beans::Property, bool >
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
index c043850e3c73..9b9ffe47aa15 100644
--- a/extensions/source/propctrlr/makefile.mk
+++ b/extensions/source/propctrlr/makefile.mk
@@ -120,6 +120,7 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 SHL1VERSIONMAP= $(TARGET).map
 
 SHL1STDLIBS= \
+        $(SVXCORELIB)	\
         $(SVXLIB)	\
         $(SFXLIB)	\
         $(SVTOOLLIB)\
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index c4dff2512a29..ac9ae434cad6 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -114,6 +114,7 @@ namespace pcr
             ,m_bContainerFocusListening( false )
             ,m_bSuspendingPropertyHandlers( false )
             ,m_bConstructed( false )
+            ,m_bBindingIntrospectee( false )
     {
         DBG_CTOR(OPropertyBrowserController,NULL);
     }
@@ -300,7 +301,13 @@ namespace pcr
             // it in order to inspect another object.
             throw VetoException();
         }
+        if ( m_bBindingIntrospectee )
+            throw VetoException();
+
+        m_bBindingIntrospectee = true;
         impl_rebindToInspectee_nothrow( InterfaceArray( _rObjects.getConstArray(), _rObjects.getConstArray() + _rObjects.getLength() ) );
+        m_bBindingIntrospectee = false;
+
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 3254294e4777..bfa55053338b 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -168,6 +168,7 @@ namespace pcr
         bool        m_bContainerFocusListening;
         bool        m_bSuspendingPropertyHandlers;
         bool        m_bConstructed;
+        bool        m_bBindingIntrospectee;
 
     protected:
         DECLARE_XINTERFACE()
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index ebe5b7c4ed48..d87865c0405c 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -69,6 +69,7 @@ namespace pcr
     {
     protected:
         typedef ControlWindow< LISTBOX_WINDOW >  ListBoxType;
+
     public:
         ListLikeControlWithModifyHandler( Window* _pParent, WinBits _nStyle )
             :ListBoxType( _pParent, _nStyle )
@@ -76,8 +77,35 @@ namespace pcr
         }
 
         void SetModifyHdl( const Link& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); }
+
+    protected:
+        long    PreNotify( NotifyEvent& _rNEvt );
     };
 
+    //------------------------------------------------------------------------
+    template< class LISTBOX_WINDOW >
+    long ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt )
+    {
+        if ( _rNEvt.GetType() == EVENT_KEYINPUT )
+        {
+            const ::KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
+            if  (   ( pKeyEvent->GetKeyCode().GetModifier() == 0 )
+                &&  (   ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEUP )
+                    ||  ( pKeyEvent->GetKeyCode().GetCode() == KEY_PAGEDOWN )
+                    )
+                )
+            {
+                if ( !ListBoxType::IsInDropDown() )
+                {
+                    // don't give the base class a chance to consume the event, in the property browser, it is
+                    // intended to scroll the complete property page
+                    return ListBoxType::GetParent()->PreNotify( _rNEvt );
+                }
+            }
+        }
+        return ListBoxType::PreNotify( _rNEvt );
+    }
+
     //========================================================================
     //= OTimeControl
     //========================================================================
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index c0374bbb3ce5..de2e7f272350 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -224,6 +224,19 @@ void SaneDlg::InitFields()
                     maReslBox.SetMin( (long)pDouble[0] );
                     maReslBox.SetMax( (long)pDouble[1] );
                     maReslBox.InsertValue( (long)pDouble[0] );
+                    // mh@openoffice.org: issue 68557: Can only select 75 and 2400 dpi in Scanner dialogue
+                    // scanner allows random setting of dpi resolution, a slider might be useful
+                    // support that
+                    // workaround: offer at least some more standard dpi resolution between
+                    // min and max value
+                    int bGot300 = 0;
+                    for ( int nRes = (long) pDouble[0] * 2; nRes < (long) pDouble[1]; nRes = nRes * 2 )
+                    {
+                        if ( !bGot300 && nRes > 300 ) {
+                            nRes = 300; bGot300 = 1;
+                        }
+                        maReslBox.InsertValue(nRes);
+                    }
                     maReslBox.InsertValue( (long)pDouble[1] );
                 }
                 if( pDouble )
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 2e0d470b3241..0b1d1e68f9f3 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -197,7 +197,14 @@ void ScannerThread::run()
 
 void ScannerManager::DestroyData()
 {
-    // unused
+    // was unused, now because of i99835: "Scanning interface not SANE API compliant"
+    // delete all SaneHolder to get Sane Dtor called
+    int i;
+    for ( i = allSanes.Count(); i > 0; i-- )
+    {
+        SaneHolder *pSaneHolder = allSanes.GetObject(i-1);
+        if ( pSaneHolder ) delete pSaneHolder;
+    }
 }
 
 // -----------------------------------------------------------------------------
diff --git a/extensions/util/hidother.src b/extensions/util/hidother.src
index 49b67060f8a3..3f8fcd5ed7f8 100644
--- a/extensions/util/hidother.src
+++ b/extensions/util/hidother.src
@@ -30,208 +30,92 @@
 
 #include "../inc/extensio.hrc"
 
-hidspecial HID_BIB_CHANGESOURCE                 { HelpId = HID_BIB_CHANGESOURCE; }
-hidspecial HID_BIB_MAPPINGDLG                   { HelpId = HID_BIB_MAPPINGDLG; }
-hidspecial HID_BIB_TBX_TABLE                    { HelpId = HID_BIB_TBX_TABLE; }
-hidspecial HID_BIB_TBX_SEARCH                   { HelpId = HID_BIB_TBX_SEARCH; }
-hidspecial HID_BIB_TBX_AUTOFILTER               { HelpId = HID_BIB_TBX_AUTOFILTER; }
+hidspecial HID_ABSPILOT                         { HelpId = HID_ABSPILOT; }
+hidspecial HID_ABSPILOT_CANCEL                  { HelpId = HID_ABSPILOT_CANCEL; }
+hidspecial HID_ABSPILOT_FINISH                  { HelpId = HID_ABSPILOT_FINISH; }
+hidspecial HID_ABSPILOT_NEXT                    { HelpId = HID_ABSPILOT_NEXT; }
+hidspecial HID_ABSPILOT_PREVIOUS                { HelpId = HID_ABSPILOT_PREVIOUS; }
 
-hidspecial HID_BIB_IDENTIFIER_POS               { HelpId = HID_BIB_IDENTIFIER_POS; }
+hidspecial HID_BIB_ADDRESS_POS                  { HelpId = HID_BIB_ADDRESS_POS; }
+hidspecial HID_BIB_ANNOTE_POS                   { HelpId = HID_BIB_ANNOTE_POS; }
 hidspecial HID_BIB_AUTHORITYTYPE_POS            { HelpId = HID_BIB_AUTHORITYTYPE_POS; }
 hidspecial HID_BIB_AUTHOR_POS                   { HelpId = HID_BIB_AUTHOR_POS; }
-hidspecial HID_BIB_TITLE_POS                    { HelpId = HID_BIB_TITLE_POS; }
-hidspecial HID_BIB_YEAR_POS                     { HelpId = HID_BIB_YEAR_POS; }
-hidspecial HID_BIB_ISBN_POS                     { HelpId = HID_BIB_ISBN_POS; }
 hidspecial HID_BIB_BOOKTITLE_POS                { HelpId = HID_BIB_BOOKTITLE_POS; }
+hidspecial HID_BIB_CHANGESOURCE                 { HelpId = HID_BIB_CHANGESOURCE; }
 hidspecial HID_BIB_CHAPTER_POS                  { HelpId = HID_BIB_CHAPTER_POS; }
+hidspecial HID_BIB_CONTROL_PAGE                 { HelpId = HID_BIB_CONTROL_PAGE; }
+hidspecial HID_BIB_CONTROL_PARENT               { HelpId = HID_BIB_CONTROL_PARENT; }
+hidspecial HID_BIB_CUSTOM1_POS                  { HelpId = HID_BIB_CUSTOM1_POS; }
+hidspecial HID_BIB_CUSTOM2_POS                  { HelpId = HID_BIB_CUSTOM2_POS; }
+hidspecial HID_BIB_CUSTOM3_POS                  { HelpId = HID_BIB_CUSTOM3_POS; }
+hidspecial HID_BIB_CUSTOM4_POS                  { HelpId = HID_BIB_CUSTOM4_POS; }
+hidspecial HID_BIB_CUSTOM5_POS                  { HelpId = HID_BIB_CUSTOM5_POS; }
+hidspecial HID_BIB_DB_GRIDCTRL                  { HelpId = HID_BIB_DB_GRIDCTRL; }
+hidspecial HID_BIB_DB_TBX                       { HelpId = HID_BIB_DB_TBX; }
+hidspecial HID_BIB_DELETE_RECORD                { HelpId = HID_BIB_DELETE_RECORD; }
 hidspecial HID_BIB_EDITION_POS                  { HelpId = HID_BIB_EDITION_POS; }
 hidspecial HID_BIB_EDITOR_POS                   { HelpId = HID_BIB_EDITOR_POS; }
 hidspecial HID_BIB_HOWPUBLISHED_POS             { HelpId = HID_BIB_HOWPUBLISHED_POS; }
+hidspecial HID_BIB_IDENTIFIER_POS               { HelpId = HID_BIB_IDENTIFIER_POS; }
+hidspecial HID_BIB_INSERT_RECORD                { HelpId = HID_BIB_INSERT_RECORD; }
 hidspecial HID_BIB_INSTITUTION_POS              { HelpId = HID_BIB_INSTITUTION_POS; }
+hidspecial HID_BIB_ISBN_POS                     { HelpId = HID_BIB_ISBN_POS; }
 hidspecial HID_BIB_JOURNAL_POS                  { HelpId = HID_BIB_JOURNAL_POS; }
+hidspecial HID_BIB_MAPPINGDLG                   { HelpId = HID_BIB_MAPPINGDLG; }
 hidspecial HID_BIB_MONTH_POS                    { HelpId = HID_BIB_MONTH_POS; }
 hidspecial HID_BIB_NOTE_POS                     { HelpId = HID_BIB_NOTE_POS; }
-hidspecial HID_BIB_ANNOTE_POS                   { HelpId = HID_BIB_ANNOTE_POS; }
 hidspecial HID_BIB_NUMBER_POS                   { HelpId = HID_BIB_NUMBER_POS; }
 hidspecial HID_BIB_ORGANIZATIONS_POS            { HelpId = HID_BIB_ORGANIZATIONS_POS; }
 hidspecial HID_BIB_PAGES_POS                    { HelpId = HID_BIB_PAGES_POS; }
 hidspecial HID_BIB_PUBLISHER_POS                { HelpId = HID_BIB_PUBLISHER_POS; }
-hidspecial HID_BIB_ADDRESS_POS                  { HelpId = HID_BIB_ADDRESS_POS; }
+hidspecial HID_BIB_REPORTTYPE_POS               { HelpId = HID_BIB_REPORTTYPE_POS; }
 hidspecial HID_BIB_SCHOOL_POS                   { HelpId = HID_BIB_SCHOOL_POS; }
 hidspecial HID_BIB_SERIES_POS                   { HelpId = HID_BIB_SERIES_POS; }
-hidspecial HID_BIB_REPORTTYPE_POS               { HelpId = HID_BIB_REPORTTYPE_POS; }
-hidspecial HID_BIB_VOLUME_POS                   { HelpId = HID_BIB_VOLUME_POS; }
+hidspecial HID_BIB_TBX_AUTOFILTER               { HelpId = HID_BIB_TBX_AUTOFILTER; }
+hidspecial HID_BIB_TBX_SEARCH                   { HelpId = HID_BIB_TBX_SEARCH; }
+hidspecial HID_BIB_TBX_TABLE                    { HelpId = HID_BIB_TBX_TABLE; }
+hidspecial HID_BIB_TITLE_POS                    { HelpId = HID_BIB_TITLE_POS; }
 hidspecial HID_BIB_URL_POS                      { HelpId = HID_BIB_URL_POS; }
-hidspecial HID_BIB_CUSTOM1_POS                  { HelpId = HID_BIB_CUSTOM1_POS; }
-hidspecial HID_BIB_CUSTOM2_POS                  { HelpId = HID_BIB_CUSTOM2_POS; }
-hidspecial HID_BIB_CUSTOM3_POS                  { HelpId = HID_BIB_CUSTOM3_POS; }
-hidspecial HID_BIB_CUSTOM4_POS                  { HelpId = HID_BIB_CUSTOM4_POS; }
-hidspecial HID_BIB_CUSTOM5_POS                  { HelpId = HID_BIB_CUSTOM5_POS; }
-
-hidspecial HID_BIB_DB_TBX                       { HelpId = HID_BIB_DB_TBX; }
-hidspecial HID_BIB_DB_GRIDCTRL                  { HelpId = HID_BIB_DB_GRIDCTRL; }
-hidspecial HID_BIB_CONTROL_PAGE                 { HelpId = HID_BIB_CONTROL_PAGE; }
-hidspecial HID_BIB_CONTROL_PARENT               { HelpId = HID_BIB_CONTROL_PARENT; }
-
-hidspecial HID_GRIDWIZARD_PREVIOUS              { HelpId = HID_GRIDWIZARD_PREVIOUS; };
-hidspecial HID_GRIDWIZARD_NEXT                  { HelpId = HID_GRIDWIZARD_NEXT; }
-hidspecial HID_GRIDWIZARD_CANCEL                { HelpId = HID_GRIDWIZARD_CANCEL; }
-hidspecial HID_GRIDWIZARD_FINISH                { HelpId = HID_GRIDWIZARD_FINISH; }
-hidspecial HID_GROUPWIZARD_PREVIOUS             { HelpId = HID_GROUPWIZARD_PREVIOUS; }
-hidspecial HID_GROUPWIZARD_NEXT                 { HelpId = HID_GROUPWIZARD_NEXT; }
-hidspecial HID_GROUPWIZARD_CANCEL               { HelpId = HID_GROUPWIZARD_CANCEL; }
-hidspecial HID_GROUPWIZARD_FINISH               { HelpId = HID_GROUPWIZARD_FINISH; }
-hidspecial HID_LISTWIZARD_PREVIOUS              { HelpId = HID_LISTWIZARD_PREVIOUS; }
-hidspecial HID_LISTWIZARD_NEXT                  { HelpId = HID_LISTWIZARD_NEXT; }
-hidspecial HID_LISTWIZARD_CANCEL                { HelpId = HID_LISTWIZARD_CANCEL; }
-hidspecial HID_LISTWIZARD_FINISH                { HelpId = HID_LISTWIZARD_FINISH; }
-hidspecial HID_DBIWIZARD_PREVIOUS               { HelpId = HID_DBIWIZARD_PREVIOUS; }
-hidspecial HID_DBIWIZARD_NEXT                   { HelpId = HID_DBIWIZARD_NEXT; }
-hidspecial HID_DBIWIZARD_CANCEL                 { HelpId = HID_DBIWIZARD_CANCEL; }
-hidspecial HID_DBIWIZARD_FINISH                 { HelpId = HID_DBIWIZARD_FINISH; }
-hidspecial UID_DBIWIZARD_SOURCESTATS            { HelpId = UID_DBIWIZARD_SOURCESTATS; }
-hidspecial UID_DBIWIZARD_SOURCEFILE             { HelpId = UID_DBIWIZARD_SOURCEFILE; }
-hidspecial UID_DBIWIZARD_QUERIES                { HelpId = UID_DBIWIZARD_QUERIES; }
-hidspecial UID_DBIWIZARD_FORMS                  { HelpId = UID_DBIWIZARD_FORMS; }
-hidspecial UID_DBIWIZARD_FORMS_SAVETO           { HelpId = UID_DBIWIZARD_FORMS_SAVETO; }
-hidspecial UID_BIB_FRAME_WINDOW                 { HelpId = UID_BIB_FRAME_WINDOW;}
+hidspecial HID_BIB_VOLUME_POS                   { HelpId = HID_BIB_VOLUME_POS; }
+hidspecial HID_BIB_YEAR_POS                     { HelpId = HID_BIB_YEAR_POS; }
 
-hidspecial HID_ABSPILOT_PREVIOUS                { HelpId = HID_ABSPILOT_PREVIOUS; }
-hidspecial HID_ABSPILOT_NEXT                    { HelpId = HID_ABSPILOT_NEXT; }
-hidspecial HID_ABSPILOT_CANCEL                  { HelpId = HID_ABSPILOT_CANCEL; }
-hidspecial HID_ABSPILOT_FINISH                  { HelpId = HID_ABSPILOT_FINISH; }
-hidspecial HID_ABSPILOT                         { HelpId = HID_ABSPILOT; }
+hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
+hidspecial HID_CHECK_FOR_UPD_CLOSE              { HelpId = HID_CHECK_FOR_UPD_CLOSE; }
+hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DESCRIPTION; }
+hidspecial HID_CHECK_FOR_UPD_DLG                { HelpId = HID_CHECK_FOR_UPD_DLG; }
+hidspecial HID_CHECK_FOR_UPD_DOWNLOAD           { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD; }
+hidspecial HID_CHECK_FOR_UPD_DOWNLOAD2          { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD2; }
+hidspecial HID_CHECK_FOR_UPD_INSTALL            { HelpId = HID_CHECK_FOR_UPD_INSTALL; }
+hidspecial HID_CHECK_FOR_UPD_PAUSE              { HelpId = HID_CHECK_FOR_UPD_PAUSE; }
+hidspecial HID_CHECK_FOR_UPD_RESUME             { HelpId = HID_CHECK_FOR_UPD_RESUME; }
+hidspecial HID_CHECK_FOR_UPD_STATUS             { HelpId = HID_CHECK_FOR_UPD_STATUS; }
 
-hidspecial UID_ABSPILOT_HELP                    { HelpId = UID_ABSPILOT_HELP; }
 hidspecial HID_DBIWIZARD                        { HelpId = HID_DBIWIZARD; }
-hidspecial UID_DBIWIZARD_HELP                   { HelpId = UID_DBIWIZARD_HELP; }
+hidspecial HID_DBIWIZARD_CANCEL                 { HelpId = HID_DBIWIZARD_CANCEL; }
 hidspecial HID_DBIWIZARD_FILESELECTION          { HelpId = HID_DBIWIZARD_FILESELECTION; }
+hidspecial HID_DBIWIZARD_FINISH                 { HelpId = HID_DBIWIZARD_FINISH; }
+hidspecial HID_DBIWIZARD_NEXT                   { HelpId = HID_DBIWIZARD_NEXT; }
+hidspecial HID_DBIWIZARD_PREVIOUS               { HelpId = HID_DBIWIZARD_PREVIOUS; }
 
-hidspecial HID_BIB_DELETE_RECORD                { HelpId = HID_BIB_DELETE_RECORD; }
-hidspecial HID_BIB_INSERT_RECORD                { HelpId = HID_BIB_INSERT_RECORD; }
-
-hidspecial HID_PROP_TITLE                       { HelpId = HID_PROP_TITLE; }
-hidspecial HID_PROP_STEP                        { HelpId = HID_PROP_STEP; }
-hidspecial HID_PROP_VALUE                       { HelpId = HID_PROP_VALUE; }
-hidspecial HID_PROP_PROGRESSVALUE               { HelpId = HID_PROP_PROGRESSVALUE; }
-hidspecial HID_PROP_PROGRESSVALUE_MIN           { HelpId = HID_PROP_PROGRESSVALUE_MIN; }
-hidspecial HID_PROP_PROGRESSVALUE_MAX           { HelpId = HID_PROP_PROGRESSVALUE_MAX; }
-hidspecial HID_PROP_SCROLLVALUE                 { HelpId = HID_PROP_SCROLLVALUE; }
-hidspecial HID_PROP_SCROLLVALUE_MIN             { HelpId = HID_PROP_SCROLLVALUE_MIN; }
-hidspecial HID_PROP_SCROLLVALUE_MAX             { HelpId = HID_PROP_SCROLLVALUE_MAX; }
-hidspecial HID_PROP_LINEINCREMENT               { HelpId = HID_PROP_LINEINCREMENT; }
-hidspecial HID_PROP_BLOCKINCREMENT              { HelpId = HID_PROP_BLOCKINCREMENT; }
-hidspecial HID_PROP_VISIBLESIZE                 { HelpId = HID_PROP_VISIBLESIZE; }
-hidspecial HID_PROP_ORIENTATION                 { HelpId = HID_PROP_ORIENTATION; }
-hidspecial HID_PROP_POSITIONX                   { HelpId = HID_PROP_POSITIONX; }
-hidspecial HID_PROP_POSITIONY                   { HelpId = HID_PROP_POSITIONY; }
-hidspecial HID_PROP_PUSHBUTTONTYPE              { HelpId = HID_PROP_PUSHBUTTONTYPE; }
-hidspecial HID_PROP_STATE                       { HelpId = HID_PROP_STATE; }
-hidspecial HID_PROP_SCALEIMAGE                  { HelpId = HID_PROP_SCALEIMAGE; }
-hidspecial HID_PROP_BOUND_CELL                  { HelpId = HID_PROP_BOUND_CELL; }
-hidspecial HID_PROP_LIST_CELL_RANGE             { HelpId = HID_PROP_LIST_CELL_RANGE; }
-hidspecial HID_PROP_CELL_EXCHANGE_TYPE          { HelpId = HID_PROP_CELL_EXCHANGE_TYPE; }
-hidspecial HID_PROP_SELECTEDITEMS               { HelpId = HID_PROP_SELECTEDITEMS; }
-hidspecial HID_PROP_SCROLLVALUEMIN              { HelpId = HID_PROP_SCROLLVALUE_MIN; }
-hidspecial HID_PROP_DEFAULT_SCROLLVALUE         { HelpId = HID_PROP_DEFAULT_SCROLLVALUE; }
-hidspecial HID_PROP_REPEAT_DELAY                { HelpId = HID_PROP_REPEAT_DELAY; }
-hidspecial HID_PROP_SYMBOLCOLOR                 { HelpId = HID_PROP_SYMBOLCOLOR; }
-hidspecial HID_PROP_SPINVALUE                   { HelpId = HID_PROP_SPINVALUE; }
-hidspecial HID_PROP_SPINVALUE_MIN               { HelpId = HID_PROP_SPINVALUE_MIN; }
-hidspecial HID_PROP_SPINVALUE_MAX               { HelpId = HID_PROP_SPINVALUE_MAX; }
-hidspecial HID_PROP_DEFAULT_SPINVALUE           { HelpId = HID_PROP_DEFAULT_SPINVALUE; }
-hidspecial HID_PROP_SPININCREMENT               { HelpId = HID_PROP_SPININCREMENT; }
-hidspecial HID_PROP_REPEAT                      { HelpId = HID_PROP_REPEAT; }
-hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
-hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
-hidspecial UID_PROP_DLG_SYMBOLCOLOR             { HelpId = UID_PROP_DLG_SYMBOLCOLOR; }
-hidspecial UID_EVT_MACRODLG                     { HelpId = UID_EVT_MACRODLG; }
-hidspecial HID_PROP_WORDBREAK                   { HelpId = HID_PROP_WORDBREAK; }
-hidspecial HID_PROP_SHOW_SCROLLBARS             { HelpId = HID_PROP_SHOW_SCROLLBARS; }
-hidspecial HID_PROP_TABORDER_CONTROLS           { HelpId = HID_PROP_TABORDER_CONTROLS; }
-hidspecial HID_PROP_ICONSIZE                    { HelpId = HID_PROP_ICONSIZE; }
-hidspecial HID_PROP_SHOW_POSITION               { HelpId = HID_PROP_SHOW_POSITION; }
-hidspecial HID_PROP_SHOW_NAVIGATION             { HelpId = HID_PROP_SHOW_NAVIGATION; }
-hidspecial HID_PROP_SHOW_RECORDACTIONS          { HelpId = HID_PROP_SHOW_RECORDACTIONS; }
-hidspecial HID_PROP_SHOW_FILTERSORT             { HelpId = HID_PROP_SHOW_FILTERSORT; }
-
-hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
-hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
-hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
-hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
-hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
-hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
-hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
-hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
-hidspecial UID_PROP_DLG_TABINDEX                { HelpId = UID_PROP_DLG_TABINDEX; }
-hidspecial UID_PROP_DLG_SQLCOMMAND              { HelpId = UID_PROP_DLG_SQLCOMMAND; }
-hidspecial UID_PROP_DLG_FORMLINKFIELDS          { HelpId = UID_PROP_DLG_FORMLINKFIELDS; }
-hidspecial HID_FIELDLINK_DETAIL_COLUMN          { HelpId = HID_FIELDLINK_DETAIL_COLUMN; }
-hidspecial HID_FIELDLINK_MASTER_COLUMN          { HelpId = HID_FIELDLINK_MASTER_COLUMN; }
-hidspecial UID_FIELDLINK_DETAIL1                { HelpId = UID_FIELDLINK_DETAIL1; }
-hidspecial UID_FIELDLINK_MASTER1                { HelpId = UID_FIELDLINK_MASTER1; }
-hidspecial UID_FIELDLINK_DETAIL2                { HelpId = UID_FIELDLINK_DETAIL2; }
-hidspecial UID_FIELDLINK_MASTER2                { HelpId = UID_FIELDLINK_MASTER2; }
-hidspecial UID_FIELDLINK_DETAIL3                { HelpId = UID_FIELDLINK_DETAIL3; }
-hidspecial UID_FIELDLINK_MASTER3                { HelpId = UID_FIELDLINK_MASTER3; }
-hidspecial UID_FIELDLINK_DETAIL4                { HelpId = UID_FIELDLINK_DETAIL4; }
-hidspecial UID_FIELDLINK_MASTER4                { HelpId = UID_FIELDLINK_MASTER4; }
-hidspecial UID_PROP_DLG_FILTER                  { HelpId = UID_PROP_DLG_FILTER; }
-hidspecial UID_PROP_DLG_ORDER                   { HelpId = UID_PROP_DLG_ORDER; }
-hidspecial UID_PROP_DLG_SELECTION               { HelpId = UID_PROP_DLG_SELECTION; }
-hidspecial UID_PROP_DLG_SYMBOLCOLOR             { HelpId = UID_PROP_DLG_SYMBOLCOLOR; }
-hidspecial UID_BRWEVT_APPROVEACTIONPERFORMED    { HelpId = UID_BRWEVT_APPROVEACTIONPERFORMED; }
-hidspecial UID_BRWEVT_ACTIONPERFORMED           { HelpId = UID_BRWEVT_ACTIONPERFORMED; }
-hidspecial UID_BRWEVT_CHANGED                   { HelpId = UID_BRWEVT_CHANGED; }
-hidspecial UID_BRWEVT_TEXTCHANGED               { HelpId = UID_BRWEVT_TEXTCHANGED; }
-hidspecial UID_BRWEVT_ITEMSTATECHANGED          { HelpId = UID_BRWEVT_ITEMSTATECHANGED; }
-hidspecial UID_BRWEVT_FOCUSGAINED               { HelpId = UID_BRWEVT_FOCUSGAINED; }
-hidspecial UID_BRWEVT_FOCUSLOST                 { HelpId = UID_BRWEVT_FOCUSLOST; }
-hidspecial UID_BRWEVT_KEYTYPED                  { HelpId = UID_BRWEVT_KEYTYPED; }
-hidspecial UID_BRWEVT_KEYUP                     { HelpId = UID_BRWEVT_KEYUP; }
-hidspecial UID_BRWEVT_MOUSEENTERED              { HelpId = UID_BRWEVT_MOUSEENTERED; }
-hidspecial UID_BRWEVT_MOUSEDRAGGED              { HelpId = UID_BRWEVT_MOUSEDRAGGED; }
-hidspecial UID_BRWEVT_MOUSEMOVED                { HelpId = UID_BRWEVT_MOUSEMOVED; }
-hidspecial UID_BRWEVT_MOUSEPRESSED              { HelpId = UID_BRWEVT_MOUSEPRESSED; }
-hidspecial UID_BRWEVT_MOUSERELEASED             { HelpId = UID_BRWEVT_MOUSERELEASED; }
-hidspecial UID_BRWEVT_MOUSEEXITED               { HelpId = UID_BRWEVT_MOUSEEXITED; }
-hidspecial UID_BRWEVT_APPROVERESETTED           { HelpId = UID_BRWEVT_APPROVERESETTED; }
-hidspecial UID_BRWEVT_RESETTED                  { HelpId = UID_BRWEVT_RESETTED; }
-hidspecial UID_BRWEVT_SUBMITTED                 { HelpId = UID_BRWEVT_SUBMITTED; }
-hidspecial UID_BRWEVT_BEFOREUPDATE              { HelpId = UID_BRWEVT_BEFOREUPDATE; }
-hidspecial UID_BRWEVT_AFTERUPDATE               { HelpId = UID_BRWEVT_AFTERUPDATE; }
-hidspecial UID_BRWEVT_LOADED                    { HelpId = UID_BRWEVT_LOADED; }
-hidspecial UID_BRWEVT_RELOADING                 { HelpId = UID_BRWEVT_RELOADING; }
-hidspecial UID_BRWEVT_RELOADED                  { HelpId = UID_BRWEVT_RELOADED; }
-hidspecial UID_BRWEVT_UNLOADING                 { HelpId = UID_BRWEVT_UNLOADING; }
-hidspecial UID_BRWEVT_UNLOADED                  { HelpId = UID_BRWEVT_UNLOADED; }
-hidspecial UID_BRWEVT_CONFIRMDELETE             { HelpId = UID_BRWEVT_CONFIRMDELETE; }
-hidspecial UID_BRWEVT_APPROVEROWCHANGE          { HelpId = UID_BRWEVT_APPROVEROWCHANGE; }
-hidspecial UID_BRWEVT_ROWCHANGE                 { HelpId = UID_BRWEVT_ROWCHANGE; }
-hidspecial UID_BRWEVT_POSITIONING               { HelpId = UID_BRWEVT_POSITIONING; }
-hidspecial UID_BRWEVT_POSITIONED                { HelpId = UID_BRWEVT_POSITIONED; }
-hidspecial UID_BRWEVT_APPROVEPARAMETER          { HelpId = UID_BRWEVT_APPROVEPARAMETER; }
-hidspecial UID_BRWEVT_ERROROCCURED              { HelpId = UID_BRWEVT_ERROROCCURED; }
-hidspecial UID_BRWEVT_ADJUSTMENTVALUECHANGED    { HelpId = UID_BRWEVT_ADJUSTMENTVALUECHANGED; }
-hidspecial HID_PROP_AUTOLINEBREAK               { HelpId = HID_PROP_AUTOLINEBREAK; }
-hidspecial HID_PROP_TEXTTYPE                    { HelpId = HID_PROP_TEXTTYPE; }
-hidspecial HID_PROP_LINEEND_FORMAT              { HelpId = HID_PROP_LINEEND_FORMAT; }
+hidspecial HID_DLG_DBCHANGE                     { HelpId = HID_DLG_DBCHANGE; }
+hidspecial HID_DLG_MAPPING                      { HelpId = HID_DLG_MAPPING; }
 
 hidspecial HID_EVT_ACTIONPERFORMED              { HelpId = HID_EVT_ACTIONPERFORMED; }
+hidspecial HID_EVT_ADJUSTMENTVALUECHANGED       { HelpId = HID_EVT_ADJUSTMENTVALUECHANGED; }
 hidspecial HID_EVT_AFTERUPDATE                  { HelpId = HID_EVT_AFTERUPDATE; }
+hidspecial HID_EVT_APPROVEACTIONPERFORMED       { HelpId = HID_EVT_APPROVEACTIONPERFORMED; }
+hidspecial HID_EVT_APPROVEPARAMETER             { HelpId = HID_EVT_APPROVEPARAMETER; }
+hidspecial HID_EVT_APPROVERESETTED              { HelpId = HID_EVT_APPROVERESETTED; }
+hidspecial HID_EVT_APPROVEROWCHANGE             { HelpId = HID_EVT_APPROVEROWCHANGE; }
 hidspecial HID_EVT_BEFOREUPDATE                 { HelpId = HID_EVT_BEFOREUPDATE; }
+hidspecial HID_EVT_CHANGED                      { HelpId = HID_EVT_CHANGED; }
 hidspecial HID_EVT_CONFIRMDELETE                { HelpId = HID_EVT_CONFIRMDELETE; }
 hidspecial HID_EVT_ERROROCCURED                 { HelpId = HID_EVT_ERROROCCURED; }
 hidspecial HID_EVT_FOCUSGAINED                  { HelpId = HID_EVT_FOCUSGAINED; }
 hidspecial HID_EVT_FOCUSLOST                    { HelpId = HID_EVT_FOCUSLOST; }
 hidspecial HID_EVT_ITEMSTATECHANGED             { HelpId = HID_EVT_ITEMSTATECHANGED; }
 hidspecial HID_EVT_KEYTYPED                     { HelpId = HID_EVT_KEYTYPED; }
+hidspecial HID_EVT_KEYUP                        { HelpId = HID_EVT_KEYUP; }
 hidspecial HID_EVT_LOADED                       { HelpId = HID_EVT_LOADED; }
 hidspecial HID_EVT_MOUSEDRAGGED                 { HelpId = HID_EVT_MOUSEDRAGGED; }
 hidspecial HID_EVT_MOUSEENTERED                 { HelpId = HID_EVT_MOUSEENTERED; }
@@ -240,74 +124,314 @@ hidspecial HID_EVT_MOUSEMOVED                   { HelpId = HID_EVT_MOUSEMOVED; }
 hidspecial HID_EVT_MOUSEPRESSED                 { HelpId = HID_EVT_MOUSEPRESSED; }
 hidspecial HID_EVT_MOUSERELEASED                { HelpId = HID_EVT_MOUSERELEASED; }
 hidspecial HID_EVT_POSITIONED                   { HelpId = HID_EVT_POSITIONED; }
+hidspecial HID_EVT_POSITIONING                  { HelpId = HID_EVT_POSITIONING; }
+hidspecial HID_EVT_RELOADED                     { HelpId = HID_EVT_RELOADED; }
+hidspecial HID_EVT_RELOADING                    { HelpId = HID_EVT_RELOADING; }
 hidspecial HID_EVT_RESETTED                     { HelpId = HID_EVT_RESETTED; }
+hidspecial HID_EVT_ROWCHANGE                    { HelpId = HID_EVT_ROWCHANGE; }
 hidspecial HID_EVT_SUBMITTED                    { HelpId = HID_EVT_SUBMITTED; }
 hidspecial HID_EVT_TEXTCHANGED                  { HelpId = HID_EVT_TEXTCHANGED; }
 hidspecial HID_EVT_UNLOADED                     { HelpId = HID_EVT_UNLOADED; }
-hidspecial HID_EVT_CHANGED                      { HelpId = HID_EVT_CHANGED; }
-hidspecial HID_EVT_APPROVEACTIONPERFORMED       { HelpId = HID_EVT_APPROVEACTIONPERFORMED; }
-hidspecial HID_EVT_APPROVERESETTED              { HelpId = HID_EVT_APPROVERESETTED; }
-hidspecial HID_EVT_KEYUP                        { HelpId = HID_EVT_KEYUP; }
-hidspecial HID_EVT_APPROVEPARAMETER             { HelpId = HID_EVT_APPROVEPARAMETER; }
-hidspecial HID_EVT_POSITIONING                  { HelpId = HID_EVT_POSITIONING; }
-hidspecial HID_EVT_RELOADED                     { HelpId = HID_EVT_RELOADED; }
-hidspecial HID_EVT_APPROVEROWCHANGE             { HelpId = HID_EVT_APPROVEROWCHANGE; }
-hidspecial HID_EVT_ROWCHANGE                    { HelpId = HID_EVT_ROWCHANGE; }
-hidspecial HID_EVT_RELOADING                    { HelpId = HID_EVT_RELOADING; }
 hidspecial HID_EVT_UNLOADING                    { HelpId = HID_EVT_UNLOADING; }
-hidspecial HID_EVT_ADJUSTMENTVALUECHANGED       { HelpId = HID_EVT_ADJUSTMENTVALUECHANGED; }
-hidspecial HID_PROP_TOGGLE                      { HelpId = HID_PROP_TOGGLE; }
+
+hidspecial HID_FIELDLINK_DETAIL_COLUMN          { HelpId = HID_FIELDLINK_DETAIL_COLUMN; }
+hidspecial HID_FIELDLINK_MASTER_COLUMN          { HelpId = HID_FIELDLINK_MASTER_COLUMN; }
+
+hidspecial HID_GRIDWIZARD_CANCEL                { HelpId = HID_GRIDWIZARD_CANCEL; }
+hidspecial HID_GRIDWIZARD_FINISH                { HelpId = HID_GRIDWIZARD_FINISH; }
+hidspecial HID_GRIDWIZARD_NEXT                  { HelpId = HID_GRIDWIZARD_NEXT; }
+hidspecial HID_GRIDWIZARD_PREVIOUS              { HelpId = HID_GRIDWIZARD_PREVIOUS; };
+hidspecial HID_GROUPWIZARD_CANCEL               { HelpId = HID_GROUPWIZARD_CANCEL; }
+hidspecial HID_GROUPWIZARD_FINISH               { HelpId = HID_GROUPWIZARD_FINISH; }
+hidspecial HID_GROUPWIZARD_NEXT                 { HelpId = HID_GROUPWIZARD_NEXT; }
+hidspecial HID_GROUPWIZARD_PREVIOUS             { HelpId = HID_GROUPWIZARD_PREVIOUS; }
+
+hidspecial HID_LISTWIZARD_CANCEL                { HelpId = HID_LISTWIZARD_CANCEL; }
+hidspecial HID_LISTWIZARD_FINISH                { HelpId = HID_LISTWIZARD_FINISH; }
+hidspecial HID_LISTWIZARD_NEXT                  { HelpId = HID_LISTWIZARD_NEXT; }
+hidspecial HID_LISTWIZARD_PREVIOUS              { HelpId = HID_LISTWIZARD_PREVIOUS; }
+
+hidspecial HID_PROP_ALIGN                       { HelpId = HID_PROP_ALIGN; }
+hidspecial HID_PROP_ALLOW_ADDITIONS             { HelpId = HID_PROP_ALLOW_ADDITIONS; }
+hidspecial HID_PROP_ALLOW_DELETIONS             { HelpId = HID_PROP_ALLOW_DELETIONS; }
+hidspecial HID_PROP_ALLOW_EDITS                 { HelpId = HID_PROP_ALLOW_EDITS; }
+hidspecial HID_PROP_ANCHOR_TYPE                 { HelpId = HID_PROP_ANCHOR_TYPE; }
+hidspecial HID_PROP_AUTOCOMPLETE                { HelpId = HID_PROP_AUTOCOMPLETE; }
+hidspecial HID_PROP_AUTOLINEBREAK               { HelpId = HID_PROP_AUTOLINEBREAK; }
+hidspecial HID_PROP_BACKGROUNDCOLOR             { HelpId = HID_PROP_BACKGROUNDCOLOR; }
+hidspecial HID_PROP_BINDING_NAME                { HelpId = HID_PROP_BINDING_NAME; }
+hidspecial HID_PROP_BIND_EXPRESSION             { HelpId = HID_PROP_BIND_EXPRESSION; }
+hidspecial HID_PROP_BLOCKINCREMENT              { HelpId = HID_PROP_BLOCKINCREMENT; }
+hidspecial HID_PROP_BORDER                      { HelpId = HID_PROP_BORDER; }
+hidspecial HID_PROP_BORDERCOLOR                 { HelpId = HID_PROP_BORDERCOLOR; }
+hidspecial HID_PROP_BOUNDCOLUMN                 { HelpId = HID_PROP_BOUNDCOLUMN; }
+hidspecial HID_PROP_BOUND_CELL                  { HelpId = HID_PROP_BOUND_CELL; }
+hidspecial HID_PROP_BUTTONTYPE                  { HelpId = HID_PROP_BUTTONTYPE; }
+hidspecial HID_PROP_CELL_EXCHANGE_TYPE          { HelpId = HID_PROP_CELL_EXCHANGE_TYPE; }
+hidspecial HID_PROP_CLASSID                     { HelpId = HID_PROP_CLASSID; }
+hidspecial HID_PROP_CONTROLLABEL                { HelpId = HID_PROP_CONTROLLABEL; }
+hidspecial HID_PROP_CONTROLSOURCE               { HelpId = HID_PROP_CONTROLSOURCE; }
+hidspecial HID_PROP_CURRENCYSYMBOL              { HelpId = HID_PROP_CURRENCYSYMBOL; }
+hidspecial HID_PROP_CURRSYM_POSITION            { HelpId = HID_PROP_CURRSYM_POSITION; }
+hidspecial HID_PROP_CURSORSOURCE                { HelpId = HID_PROP_CURSORSOURCE; }
+hidspecial HID_PROP_CURSORSOURCETYPE            { HelpId = HID_PROP_CURSORSOURCETYPE; }
+hidspecial HID_PROP_CURSORTYPE                  { HelpId = HID_PROP_CURSORTYPE; }
+hidspecial HID_PROP_CYCLE                       { HelpId = HID_PROP_CYCLE; }
+hidspecial HID_PROP_DATAENTRY                   { HelpId = HID_PROP_DATAENTRY; }
+hidspecial HID_PROP_DATASOURCE                  { HelpId = HID_PROP_DATASOURCE; }
+hidspecial HID_PROP_DATE                        { HelpId = HID_PROP_DATE; }
+hidspecial HID_PROP_DATEFORMAT                  { HelpId = HID_PROP_DATEFORMAT; }
+hidspecial HID_PROP_DATEMAX                     { HelpId = HID_PROP_DATEMAX; }
+hidspecial HID_PROP_DATEMIN                     { HelpId = HID_PROP_DATEMIN; }
+hidspecial HID_PROP_DECIMAL_ACCURACY            { HelpId = HID_PROP_DECIMAL_ACCURACY; }
+hidspecial HID_PROP_DECORATION                  { HelpId = HID_PROP_DECORATION; }
+hidspecial HID_PROP_DEFAULTVALUE                { HelpId = HID_PROP_DEFAULTVALUE; }
+hidspecial HID_PROP_DEFAULT_BUTTON              { HelpId = HID_PROP_DEFAULT_BUTTON; }
+hidspecial HID_PROP_DEFAULT_DATE                { HelpId = HID_PROP_DEFAULT_DATE; }
+hidspecial HID_PROP_DEFAULT_LONG_VALUE          { HelpId = HID_PROP_DEFAULT_LONG_VALUE; }
+hidspecial HID_PROP_DEFAULT_SCROLLVALUE         { HelpId = HID_PROP_DEFAULT_SCROLLVALUE; }
+hidspecial HID_PROP_DEFAULT_SELECT_SEQ          { HelpId = HID_PROP_DEFAULT_SELECT_SEQ; }
+hidspecial HID_PROP_DEFAULT_SPINVALUE           { HelpId = HID_PROP_DEFAULT_SPINVALUE; }
+hidspecial HID_PROP_DEFAULT_STATE               { HelpId = HID_PROP_DEFAULT_STATE; }
+hidspecial HID_PROP_DEFAULT_TIME                { HelpId = HID_PROP_DEFAULT_TIME; }
+hidspecial HID_PROP_DIRTY                       { HelpId = HID_PROP_DIRTY; }
+hidspecial HID_PROP_DROPDOWN                    { HelpId = HID_PROP_DROPDOWN; }
+hidspecial HID_PROP_ECHO_CHAR                   { HelpId = HID_PROP_ECHO_CHAR; }
+hidspecial HID_PROP_EDITABLE                    { HelpId = HID_PROP_EDITABLE; }
+hidspecial HID_PROP_EDITMASK                    { HelpId = HID_PROP_EDITMASK; }
+hidspecial HID_PROP_EFFECTIVEDEFAULT            { HelpId = HID_PROP_EFFECTIVEDEFAULT; }
+hidspecial HID_PROP_EFFECTIVEMAX                { HelpId = HID_PROP_EFFECTIVEMAX; }
+hidspecial HID_PROP_EFFECTIVEMIN                { HelpId = HID_PROP_EFFECTIVEMIN; }
+hidspecial HID_PROP_EMPTY_IS_NULL               { HelpId = HID_PROP_EMPTY_IS_NULL; }
+hidspecial HID_PROP_ENABLED                     { HelpId = HID_PROP_ENABLED; }
+hidspecial HID_PROP_ENABLE_VISIBLE              { HelpId = HID_PROP_ENABLE_VISIBLE; }
+hidspecial HID_PROP_ESCAPE_PROCESSING           { HelpId = HID_PROP_ESCAPE_PROCESSING; }
+hidspecial HID_PROP_FILLCOLOR                   { HelpId = HID_PROP_FILLCOLOR; }
+hidspecial HID_PROP_FILTER                      { HelpId = HID_PROP_FILTER; }
+hidspecial HID_PROP_FILTERPROPOSAL              { HelpId = HID_PROP_FILTERPROPOSAL; }
 hidspecial HID_PROP_FOCUSONCLICK                { HelpId = HID_PROP_FOCUSONCLICK; }
+hidspecial HID_PROP_FONT                        { HelpId = HID_PROP_FONT; }
+hidspecial HID_PROP_FORMATKEY                   { HelpId = HID_PROP_FORMATKEY; }
+hidspecial HID_PROP_GROUPBOX                    { HelpId = HID_PROP_GROUPBOX; }
+hidspecial HID_PROP_HEIGHT                      { HelpId = HID_PROP_HEIGHT; }
+hidspecial HID_PROP_HELPTEXT                    { HelpId = HID_PROP_HELPTEXT; }
+hidspecial HID_PROP_HELPURL                     { HelpId = HID_PROP_HELPURL; }
+hidspecial HID_PROP_HIDDEN_VALUE                { HelpId = HID_PROP_HIDDEN_VALUE; }
 hidspecial HID_PROP_HIDEINACTIVESELECTION       { HelpId = HID_PROP_HIDEINACTIVESELECTION; }
-hidspecial HID_PROP_VISUALEFFECT                { HelpId = HID_PROP_VISUALEFFECT; }
-hidspecial HID_PROP_BORDERCOLOR                 { HelpId = HID_PROP_BORDERCOLOR; }
-hidspecial UID_PROP_DLG_BORDERCOLOR             { HelpId = UID_PROP_DLG_BORDERCOLOR; }
+hidspecial HID_PROP_HSCROLL                     { HelpId = HID_PROP_HSCROLL; }
+hidspecial HID_PROP_ICONSIZE                    { HelpId = HID_PROP_ICONSIZE; }
 hidspecial HID_PROP_IMAGEPOSITION               { HelpId = HID_PROP_IMAGEPOSITION; }
+hidspecial HID_PROP_IMAGE_URL                   { HelpId = HID_PROP_IMAGE_URL; }
+hidspecial HID_PROP_INPUT_REQUIRED              { HelpId = HID_PROP_INPUT_REQUIRED; }
+hidspecial HID_PROP_INVOKES_STOP_NOT_EDITING    { HelpId = HID_PROP_INVOKES_STOP_NOT_EDITING; }
+hidspecial HID_PROP_LABEL                       { HelpId = HID_PROP_LABEL; }
+hidspecial HID_PROP_LEFT                        { HelpId = HID_PROP_LEFT; }
+hidspecial HID_PROP_LINECOLOR                   { HelpId = HID_PROP_LINECOLOR; }
+hidspecial HID_PROP_LINECOUNT                   { HelpId = HID_PROP_LINECOUNT; }
+hidspecial HID_PROP_LINEEND_FORMAT              { HelpId = HID_PROP_LINEEND_FORMAT; }
+hidspecial HID_PROP_LINEINCREMENT               { HelpId = HID_PROP_LINEINCREMENT; }
+hidspecial HID_PROP_LISTINDEX                   { HelpId = HID_PROP_LISTINDEX; }
+hidspecial HID_PROP_LISTSOURCE                  { HelpId = HID_PROP_LISTSOURCE; }
+hidspecial HID_PROP_LISTSOURCETYPE              { HelpId = HID_PROP_LISTSOURCETYPE; }
+hidspecial HID_PROP_LIST_BINDING                { HelpId = HID_PROP_LIST_BINDING; }
+hidspecial HID_PROP_LIST_CELL_RANGE             { HelpId = HID_PROP_LIST_CELL_RANGE; }
+hidspecial HID_PROP_LITERALMASK                 { HelpId = HID_PROP_LITERALMASK; }
+hidspecial HID_PROP_LOCKED                      { HelpId = HID_PROP_LOCKED; }
+hidspecial HID_PROP_MASTERFIELDS                { HelpId = HID_PROP_MASTERFIELDS; }
+hidspecial HID_PROP_MAXTEXTLEN                  { HelpId = HID_PROP_MAXTEXTLEN; }
+hidspecial HID_PROP_MULTILINE                   { HelpId = HID_PROP_MULTILINE; }
+hidspecial HID_PROP_MULTISELECTION              { HelpId = HID_PROP_MULTISELECTION; }
+hidspecial HID_PROP_NAME                        { HelpId = HID_PROP_NAME; }
+hidspecial HID_PROP_NAVIGATION                  { HelpId = HID_PROP_NAVIGATION; }
+hidspecial HID_PROP_NAVIGATIONBAR               { HelpId = HID_PROP_NAVIGATIONBAR; }
+hidspecial HID_PROP_NOLABEL                     { HelpId = HID_PROP_NOLABEL; }
+hidspecial HID_PROP_OLDVALUE                    { HelpId = HID_PROP_OLDVALUE; }
+hidspecial HID_PROP_ORIENTATION                 { HelpId = HID_PROP_ORIENTATION; }
+hidspecial HID_PROP_POSITIONX                   { HelpId = HID_PROP_POSITIONX; }
+hidspecial HID_PROP_POSITIONY                   { HelpId = HID_PROP_POSITIONY; }
+hidspecial HID_PROP_PRINTABLE                   { HelpId = HID_PROP_PRINTABLE; }
+hidspecial HID_PROP_PROGRESSVALUE               { HelpId = HID_PROP_PROGRESSVALUE; }
+hidspecial HID_PROP_PROGRESSVALUE_MAX           { HelpId = HID_PROP_PROGRESSVALUE_MAX; }
+hidspecial HID_PROP_PROGRESSVALUE_MIN           { HelpId = HID_PROP_PROGRESSVALUE_MIN; }
+hidspecial HID_PROP_PUSHBUTTONTYPE              { HelpId = HID_PROP_PUSHBUTTONTYPE; }
+hidspecial HID_PROP_READONLY                    { HelpId = HID_PROP_READONLY; }
+hidspecial HID_PROP_RECORDMARKER                { HelpId = HID_PROP_RECORDMARKER; }
+hidspecial HID_PROP_REFVALUE                    { HelpId = HID_PROP_REFVALUE; }
+hidspecial HID_PROP_REPEAT                      { HelpId = HID_PROP_REPEAT; }
+hidspecial HID_PROP_REPEAT_DELAY                { HelpId = HID_PROP_REPEAT_DELAY; }
+hidspecial HID_PROP_REQUIRED                    { HelpId = HID_PROP_REQUIRED; }
+hidspecial HID_PROP_RIGHT                       { HelpId = HID_PROP_RIGHT; }
+hidspecial HID_PROP_ROOT_DISPLAYED              { HelpId = HID_PROP_ROOT_DISPLAYED; }
+hidspecial HID_PROP_ROWHEIGHT                   { HelpId = HID_PROP_ROWHEIGHT; }
+hidspecial HID_PROP_ROW_HEIGHT                  { HelpId = HID_PROP_ROW_HEIGHT; }
+hidspecial HID_PROP_SCALEIMAGE                  { HelpId = HID_PROP_SCALEIMAGE; }
+hidspecial HID_PROP_SCROLLVALUE                 { HelpId = HID_PROP_SCROLLVALUE; }
+hidspecial HID_PROP_SCROLLVALUEMIN              { HelpId = HID_PROP_SCROLLVALUE_MIN; }
+hidspecial HID_PROP_SCROLLVALUE_MAX             { HelpId = HID_PROP_SCROLLVALUE_MAX; }
+hidspecial HID_PROP_SCROLLVALUE_MIN             { HelpId = HID_PROP_SCROLLVALUE_MIN; }
+hidspecial HID_PROP_SEARCHING                   { HelpId = HID_PROP_SEARCHING; }
+hidspecial HID_PROP_SELECTEDITEMS               { HelpId = HID_PROP_SELECTEDITEMS; }
+hidspecial HID_PROP_SELECTION_TYPE              { HelpId = HID_PROP_SELECTION_TYPE; }
+hidspecial HID_PROP_SHOWS_HANDLES               { HelpId = HID_PROP_SHOWS_HANDLES; }
+hidspecial HID_PROP_SHOWS_ROOT_HANDLES          { HelpId = HID_PROP_SHOWS_ROOT_HANDLES; }
+hidspecial HID_PROP_SHOWTHOUSANDSEP             { HelpId = HID_PROP_SHOWTHOUSANDSEP; }
+hidspecial HID_PROP_SHOW_FILTERSORT             { HelpId = HID_PROP_SHOW_FILTERSORT; }
+hidspecial HID_PROP_SHOW_NAVIGATION             { HelpId = HID_PROP_SHOW_NAVIGATION; }
+hidspecial HID_PROP_SHOW_POSITION               { HelpId = HID_PROP_SHOW_POSITION; }
+hidspecial HID_PROP_SHOW_RECORDACTIONS          { HelpId = HID_PROP_SHOW_RECORDACTIONS; }
+hidspecial HID_PROP_SHOW_SCROLLBARS             { HelpId = HID_PROP_SHOW_SCROLLBARS; }
+hidspecial HID_PROP_SLAVEFIELDS                 { HelpId = HID_PROP_SLAVEFIELDS; }
+hidspecial HID_PROP_SORT_CRITERIA               { HelpId = HID_PROP_SORT_CRITERIA; }
+hidspecial HID_PROP_SPIN                        { HelpId = HID_PROP_SPIN; }
+hidspecial HID_PROP_SPININCREMENT               { HelpId = HID_PROP_SPININCREMENT; }
+hidspecial HID_PROP_SPINVALUE                   { HelpId = HID_PROP_SPINVALUE; }
+hidspecial HID_PROP_SPINVALUE_MAX               { HelpId = HID_PROP_SPINVALUE_MAX; }
+hidspecial HID_PROP_SPINVALUE_MIN               { HelpId = HID_PROP_SPINVALUE_MIN; }
+hidspecial HID_PROP_STATE                       { HelpId = HID_PROP_STATE; }
+hidspecial HID_PROP_STEP                        { HelpId = HID_PROP_STEP; }
+hidspecial HID_PROP_STRICTFORMAT                { HelpId = HID_PROP_STRICTFORMAT; }
+hidspecial HID_PROP_STRINGITEMLIST              { HelpId = HID_PROP_STRINGITEMLIST; }
+hidspecial HID_PROP_SUBMISSION_ID               { HelpId = HID_PROP_SUBMISSION_ID; }
+hidspecial HID_PROP_SUBMIT_ACTION               { HelpId = HID_PROP_SUBMIT_ACTION; }
+hidspecial HID_PROP_SUBMIT_ENCODING             { HelpId = HID_PROP_SUBMIT_ENCODING; }
+hidspecial HID_PROP_SUBMIT_METHOD               { HelpId = HID_PROP_SUBMIT_METHOD; }
+hidspecial HID_PROP_SUBMIT_TARGET               { HelpId = HID_PROP_SUBMIT_TARGET; }
+hidspecial HID_PROP_SYMBOLCOLOR                 { HelpId = HID_PROP_SYMBOLCOLOR; }
+hidspecial HID_PROP_TABINDEX                    { HelpId = HID_PROP_TABINDEX; }
+hidspecial HID_PROP_TABORDER_CONTROLS           { HelpId = HID_PROP_TABORDER_CONTROLS; }
+hidspecial HID_PROP_TABSTOP                     { HelpId = HID_PROP_TABSTOP; }
+hidspecial HID_PROP_TAG                         { HelpId = HID_PROP_TAG; }
+hidspecial HID_PROP_TARGET_FRAME                { HelpId = HID_PROP_TARGET_FRAME; }
+hidspecial HID_PROP_TARGET_URL                  { HelpId = HID_PROP_TARGET_URL; }
+hidspecial HID_PROP_TEXT                        { HelpId = HID_PROP_TEXT; }
+hidspecial HID_PROP_TEXTTYPE                    { HelpId = HID_PROP_TEXTTYPE; }
+hidspecial HID_PROP_TIME                        { HelpId = HID_PROP_TIME; }
+hidspecial HID_PROP_TIMEFORMAT                  { HelpId = HID_PROP_TIMEFORMAT; }
+hidspecial HID_PROP_TIMEMAX                     { HelpId = HID_PROP_TIMEMAX; }
+hidspecial HID_PROP_TIMEMIN                     { HelpId = HID_PROP_TIMEMIN; }
+hidspecial HID_PROP_TITLE                       { HelpId = HID_PROP_TITLE; }
+hidspecial HID_PROP_TOGGLE                      { HelpId = HID_PROP_TOGGLE; }
+hidspecial HID_PROP_TRISTATE                    { HelpId = HID_PROP_TRISTATE; }
+hidspecial HID_PROP_UNCHECKEDREFVALUE           { HelpId = HID_PROP_UNCHECKEDREFVALUE; }
+hidspecial HID_PROP_UNIQUE                      { HelpId = HID_PROP_UNIQUE; }
+hidspecial HID_PROP_VALUE                       { HelpId = HID_PROP_VALUE; }
+hidspecial HID_PROP_VALUEMAX                    { HelpId = HID_PROP_VALUEMAX; }
+hidspecial HID_PROP_VALUEMIN                    { HelpId = HID_PROP_VALUEMIN; }
+hidspecial HID_PROP_VALUESTEP                   { HelpId = HID_PROP_VALUESTEP; }
+hidspecial HID_PROP_VERTICAL_ALIGN              { HelpId = HID_PROP_VERTICAL_ALIGN; }
+hidspecial HID_PROP_VISIBLESIZE                 { HelpId = HID_PROP_VISIBLESIZE; }
+hidspecial HID_PROP_VISUALEFFECT                { HelpId = HID_PROP_VISUALEFFECT; }
+hidspecial HID_PROP_VSCROLL                     { HelpId = HID_PROP_VSCROLL; }
+hidspecial HID_PROP_WHEEL_BEHAVIOR              { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
+hidspecial HID_PROP_WIDTH                       { HelpId = HID_PROP_WIDTH; }
+hidspecial HID_PROP_WORDBREAK                   { HelpId = HID_PROP_WORDBREAK; }
+hidspecial HID_PROP_WRITING_MODE                { HelpId = HID_PROP_WRITING_MODE; }
 hidspecial HID_PROP_XML_DATA_MODEL              { HelpId = HID_PROP_XML_DATA_MODEL; }
-hidspecial HID_PROP_BIND_EXPRESSION             { HelpId = HID_PROP_BIND_EXPRESSION; }
-hidspecial HID_PROP_XSD_REQUIRED                { HelpId = HID_PROP_XSD_REQUIRED; }
-hidspecial HID_PROP_XSD_RELEVANT                { HelpId = HID_PROP_XSD_RELEVANT; }
-hidspecial HID_PROP_XSD_READONLY                { HelpId = HID_PROP_XSD_READONLY; }
-hidspecial HID_PROP_XSD_CONSTRAINT              { HelpId = HID_PROP_XSD_CONSTRAINT; }
 hidspecial HID_PROP_XSD_CALCULATION             { HelpId = HID_PROP_XSD_CALCULATION; }
+hidspecial HID_PROP_XSD_CONSTRAINT              { HelpId = HID_PROP_XSD_CONSTRAINT; }
 hidspecial HID_PROP_XSD_DATA_TYPE               { HelpId = HID_PROP_XSD_DATA_TYPE; }
-hidspecial HID_PROP_XSD_WHITESPACES             { HelpId = HID_PROP_XSD_WHITESPACES; }
-hidspecial HID_PROP_XSD_PATTERN                 { HelpId = HID_PROP_XSD_PATTERN; }
+hidspecial HID_PROP_XSD_FRACTION_DIGITS         { HelpId = HID_PROP_XSD_FRACTION_DIGITS; }
 hidspecial HID_PROP_XSD_LENGTH                  { HelpId = HID_PROP_XSD_LENGTH; }
-hidspecial HID_PROP_XSD_MIN_LENGTH              { HelpId = HID_PROP_XSD_MIN_LENGTH; }
+hidspecial HID_PROP_XSD_MAX_EXCLUSIVE           { HelpId = HID_PROP_XSD_MAX_EXCLUSIVE; }
+hidspecial HID_PROP_XSD_MAX_INCLUSIVE           { HelpId = HID_PROP_XSD_MAX_INCLUSIVE; }
 hidspecial HID_PROP_XSD_MAX_LENGTH              { HelpId = HID_PROP_XSD_MAX_LENGTH; }
+hidspecial HID_PROP_XSD_MIN_EXCLUSIVE           { HelpId = HID_PROP_XSD_MIN_EXCLUSIVE; }
+hidspecial HID_PROP_XSD_MIN_INCLUSIVE           { HelpId = HID_PROP_XSD_MIN_INCLUSIVE; }
+hidspecial HID_PROP_XSD_MIN_LENGTH              { HelpId = HID_PROP_XSD_MIN_LENGTH; }
+hidspecial HID_PROP_XSD_PATTERN                 { HelpId = HID_PROP_XSD_PATTERN; }
+hidspecial HID_PROP_XSD_READONLY                { HelpId = HID_PROP_XSD_READONLY; }
+hidspecial HID_PROP_XSD_RELEVANT                { HelpId = HID_PROP_XSD_RELEVANT; }
+hidspecial HID_PROP_XSD_REQUIRED                { HelpId = HID_PROP_XSD_REQUIRED; }
+hidspecial HID_PROP_XSD_TOTAL_DIGITS            { HelpId = HID_PROP_XSD_TOTAL_DIGITS; }
+hidspecial HID_PROP_XSD_WHITESPACES             { HelpId = HID_PROP_XSD_WHITESPACES; }
+
+hidspecial HID_PROTOCOLS                        { HelpId = HID_PROTOCOLS; }
+hidspecial HID_SELECTION_TLB                    { HelpId = HID_SELECTION_TLB; }
+
+hidspecial UID_ABSPILOT_HELP                    { HelpId = UID_ABSPILOT_HELP; }
+hidspecial UID_BIB_FRAME_WINDOW                 { HelpId = UID_BIB_FRAME_WINDOW;}
+
+hidspecial UID_BRWEVT_ACTIONPERFORMED           { HelpId = UID_BRWEVT_ACTIONPERFORMED; }
+hidspecial UID_BRWEVT_ADJUSTMENTVALUECHANGED    { HelpId = UID_BRWEVT_ADJUSTMENTVALUECHANGED; }
+hidspecial UID_BRWEVT_AFTERUPDATE               { HelpId = UID_BRWEVT_AFTERUPDATE; }
+hidspecial UID_BRWEVT_APPROVEACTIONPERFORMED    { HelpId = UID_BRWEVT_APPROVEACTIONPERFORMED; }
+hidspecial UID_BRWEVT_APPROVEPARAMETER          { HelpId = UID_BRWEVT_APPROVEPARAMETER; }
+hidspecial UID_BRWEVT_APPROVERESETTED           { HelpId = UID_BRWEVT_APPROVERESETTED; }
+hidspecial UID_BRWEVT_APPROVEROWCHANGE          { HelpId = UID_BRWEVT_APPROVEROWCHANGE; }
+hidspecial UID_BRWEVT_BEFOREUPDATE              { HelpId = UID_BRWEVT_BEFOREUPDATE; }
+hidspecial UID_BRWEVT_CHANGED                   { HelpId = UID_BRWEVT_CHANGED; }
+hidspecial UID_BRWEVT_CONFIRMDELETE             { HelpId = UID_BRWEVT_CONFIRMDELETE; }
+hidspecial UID_BRWEVT_ERROROCCURED              { HelpId = UID_BRWEVT_ERROROCCURED; }
+hidspecial UID_BRWEVT_FOCUSGAINED               { HelpId = UID_BRWEVT_FOCUSGAINED; }
+hidspecial UID_BRWEVT_FOCUSLOST                 { HelpId = UID_BRWEVT_FOCUSLOST; }
+hidspecial UID_BRWEVT_ITEMSTATECHANGED          { HelpId = UID_BRWEVT_ITEMSTATECHANGED; }
+hidspecial UID_BRWEVT_KEYTYPED                  { HelpId = UID_BRWEVT_KEYTYPED; }
+hidspecial UID_BRWEVT_KEYUP                     { HelpId = UID_BRWEVT_KEYUP; }
+hidspecial UID_BRWEVT_LOADED                    { HelpId = UID_BRWEVT_LOADED; }
+hidspecial UID_BRWEVT_MOUSEDRAGGED              { HelpId = UID_BRWEVT_MOUSEDRAGGED; }
+hidspecial UID_BRWEVT_MOUSEENTERED              { HelpId = UID_BRWEVT_MOUSEENTERED; }
+hidspecial UID_BRWEVT_MOUSEEXITED               { HelpId = UID_BRWEVT_MOUSEEXITED; }
+hidspecial UID_BRWEVT_MOUSEMOVED                { HelpId = UID_BRWEVT_MOUSEMOVED; }
+hidspecial UID_BRWEVT_MOUSEPRESSED              { HelpId = UID_BRWEVT_MOUSEPRESSED; }
+hidspecial UID_BRWEVT_MOUSERELEASED             { HelpId = UID_BRWEVT_MOUSERELEASED; }
+hidspecial UID_BRWEVT_POSITIONED                { HelpId = UID_BRWEVT_POSITIONED; }
+hidspecial UID_BRWEVT_POSITIONING               { HelpId = UID_BRWEVT_POSITIONING; }
+hidspecial UID_BRWEVT_RELOADED                  { HelpId = UID_BRWEVT_RELOADED; }
+hidspecial UID_BRWEVT_RELOADING                 { HelpId = UID_BRWEVT_RELOADING; }
+hidspecial UID_BRWEVT_RESETTED                  { HelpId = UID_BRWEVT_RESETTED; }
+hidspecial UID_BRWEVT_ROWCHANGE                 { HelpId = UID_BRWEVT_ROWCHANGE; }
+hidspecial UID_BRWEVT_SUBMITTED                 { HelpId = UID_BRWEVT_SUBMITTED; }
+hidspecial UID_BRWEVT_TEXTCHANGED               { HelpId = UID_BRWEVT_TEXTCHANGED; }
+hidspecial UID_BRWEVT_UNLOADED                  { HelpId = UID_BRWEVT_UNLOADED; }
+hidspecial UID_BRWEVT_UNLOADING                 { HelpId = UID_BRWEVT_UNLOADING; }
+
+hidspecial UID_DBIWIZARD_FORMS                  { HelpId = UID_DBIWIZARD_FORMS; }
+hidspecial UID_DBIWIZARD_FORMS_SAVETO           { HelpId = UID_DBIWIZARD_FORMS_SAVETO; }
+hidspecial UID_DBIWIZARD_HELP                   { HelpId = UID_DBIWIZARD_HELP; }
+hidspecial UID_DBIWIZARD_QUERIES                { HelpId = UID_DBIWIZARD_QUERIES; }
+hidspecial UID_DBIWIZARD_SOURCEFILE             { HelpId = UID_DBIWIZARD_SOURCEFILE; }
+hidspecial UID_DBIWIZARD_SOURCESTATS            { HelpId = UID_DBIWIZARD_SOURCESTATS; }
+
+hidspecial UID_EVT_MACRODLG                     { HelpId = UID_EVT_MACRODLG; }
+
+hidspecial UID_FIELDLINK_DETAIL1                { HelpId = UID_FIELDLINK_DETAIL1; }
+hidspecial UID_FIELDLINK_DETAIL2                { HelpId = UID_FIELDLINK_DETAIL2; }
+hidspecial UID_FIELDLINK_DETAIL3                { HelpId = UID_FIELDLINK_DETAIL3; }
+hidspecial UID_FIELDLINK_DETAIL4                { HelpId = UID_FIELDLINK_DETAIL4; }
+hidspecial UID_FIELDLINK_MASTER1                { HelpId = UID_FIELDLINK_MASTER1; }
+hidspecial UID_FIELDLINK_MASTER2                { HelpId = UID_FIELDLINK_MASTER2; }
+hidspecial UID_FIELDLINK_MASTER3                { HelpId = UID_FIELDLINK_MASTER3; }
+hidspecial UID_FIELDLINK_MASTER4                { HelpId = UID_FIELDLINK_MASTER4; }
+
+hidspecial UID_PROP_ADD_DATA_TYPE               { HelpId = UID_PROP_ADD_DATA_TYPE; }
+hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
+hidspecial UID_PROP_DLG_ATTR_DATASOURCE         { HelpId = UID_PROP_DLG_ATTR_DATASOURCE; }
+hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
+hidspecial UID_PROP_DLG_ATTR_TARGET_URL         { HelpId = UID_PROP_DLG_ATTR_TARGET_URL; }
+hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
+hidspecial UID_PROP_DLG_BACKGROUNDCOLOR         { HelpId = UID_PROP_DLG_BACKGROUNDCOLOR; }
 hidspecial UID_PROP_DLG_BIND_EXPRESSION         { HelpId = UID_PROP_DLG_BIND_EXPRESSION; }
-hidspecial UID_PROP_DLG_XSD_REQUIRED            { HelpId = UID_PROP_DLG_XSD_REQUIRED; }
-hidspecial UID_PROP_DLG_XSD_RELEVANT            { HelpId = UID_PROP_DLG_XSD_RELEVANT; }
-hidspecial UID_PROP_DLG_XSD_READONLY            { HelpId = UID_PROP_DLG_XSD_READONLY; }
-hidspecial UID_PROP_DLG_XSD_CONSTRAINT          { HelpId = UID_PROP_DLG_XSD_CONSTRAINT; }
+hidspecial UID_PROP_DLG_BORDERCOLOR             { HelpId = UID_PROP_DLG_BORDERCOLOR; }
+hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
+hidspecial UID_PROP_DLG_CONTROLLABEL            { HelpId = UID_PROP_DLG_CONTROLLABEL; }
+hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
+hidspecial UID_PROP_DLG_FILLCOLOR               { HelpId = UID_PROP_DLG_FILLCOLOR; }
+hidspecial UID_PROP_DLG_FILTER                  { HelpId = UID_PROP_DLG_FILTER; }
+hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
+hidspecial UID_PROP_DLG_FONT_TYPE               { HelpId = UID_PROP_DLG_FONT_TYPE; }
+hidspecial UID_PROP_DLG_FORMLINKFIELDS          { HelpId = UID_PROP_DLG_FORMLINKFIELDS; }
+hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
+hidspecial UID_PROP_DLG_IMAGE_URL               { HelpId = UID_PROP_DLG_IMAGE_URL; }
+hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
+hidspecial UID_PROP_DLG_NUMBER_FORMAT           { HelpId = UID_PROP_DLG_NUMBER_FORMAT; }
+hidspecial UID_PROP_DLG_ORDER                   { HelpId = UID_PROP_DLG_ORDER; }
+hidspecial UID_PROP_DLG_SELECTION               { HelpId = UID_PROP_DLG_SELECTION; }
+hidspecial UID_PROP_DLG_SQLCOMMAND              { HelpId = UID_PROP_DLG_SQLCOMMAND; }
+hidspecial UID_PROP_DLG_SYMBOLCOLOR             { HelpId = UID_PROP_DLG_SYMBOLCOLOR; }
+hidspecial UID_PROP_DLG_TABINDEX                { HelpId = UID_PROP_DLG_TABINDEX; }
 hidspecial UID_PROP_DLG_XSD_CALCULATION         { HelpId = UID_PROP_DLG_XSD_CALCULATION; }
-hidspecial UID_PROP_ADD_DATA_TYPE               { HelpId = UID_PROP_ADD_DATA_TYPE; }
+hidspecial UID_PROP_DLG_XSD_CONSTRAINT          { HelpId = UID_PROP_DLG_XSD_CONSTRAINT; }
+hidspecial UID_PROP_DLG_XSD_READONLY            { HelpId = UID_PROP_DLG_XSD_READONLY; }
+hidspecial UID_PROP_DLG_XSD_RELEVANT            { HelpId = UID_PROP_DLG_XSD_RELEVANT; }
+hidspecial UID_PROP_DLG_XSD_REQUIRED            { HelpId = UID_PROP_DLG_XSD_REQUIRED; }
 hidspecial UID_PROP_REMOVE_DATA_TYPE            { HelpId = UID_PROP_REMOVE_DATA_TYPE; }
-hidspecial HID_PROP_XSD_TOTAL_DIGITS            { HelpId = HID_PROP_XSD_TOTAL_DIGITS; }
-hidspecial HID_PROP_XSD_FRACTION_DIGITS         { HelpId = HID_PROP_XSD_FRACTION_DIGITS; }
-hidspecial HID_PROP_XSD_MAX_INCLUSIVE           { HelpId = HID_PROP_XSD_MAX_INCLUSIVE; }
-hidspecial HID_PROP_XSD_MAX_EXCLUSIVE           { HelpId = HID_PROP_XSD_MAX_EXCLUSIVE; }
-hidspecial HID_PROP_XSD_MIN_INCLUSIVE           { HelpId = HID_PROP_XSD_MIN_INCLUSIVE; }
-hidspecial HID_PROP_XSD_MIN_EXCLUSIVE           { HelpId = HID_PROP_XSD_MIN_EXCLUSIVE; }
-hidspecial HID_PROP_UNCHECKEDREFVALUE           { HelpId = HID_PROP_UNCHECKEDREFVALUE; }
-hidspecial HID_PROP_SUBMISSION_ID               { HelpId = HID_PROP_SUBMISSION_ID; }
-hidspecial HID_PROP_LIST_BINDING                { HelpId = HID_PROP_LIST_BINDING; }
-hidspecial HID_PROP_BINDING_NAME                { HelpId = HID_PROP_BINDING_NAME; }
-
-hidspecial HID_CHECK_FOR_UPD_DLG                { HelpId = HID_CHECK_FOR_UPD_DLG; }
-hidspecial HID_CHECK_FOR_UPD_CLOSE              { HelpId = HID_CHECK_FOR_UPD_CLOSE; }
-hidspecial HID_CHECK_FOR_UPD_PAUSE              { HelpId = HID_CHECK_FOR_UPD_PAUSE; }
-hidspecial HID_CHECK_FOR_UPD_RESUME             { HelpId = HID_CHECK_FOR_UPD_RESUME; }
-hidspecial HID_CHECK_FOR_UPD_DOWNLOAD           { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD; }
-hidspecial HID_CHECK_FOR_UPD_DOWNLOAD2          { HelpId = HID_CHECK_FOR_UPD_DOWNLOAD2; }
-hidspecial HID_CHECK_FOR_UPD_INSTALL            { HelpId = HID_CHECK_FOR_UPD_INSTALL; }
-hidspecial HID_CHECK_FOR_UPD_STATUS             { HelpId = HID_CHECK_FOR_UPD_STATUS; }
-hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DESCRIPTION; }
-hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
-hidspecial HID_PROP_NOLABEL                     { HelpId = HID_PROP_NOLABEL; }
-hidspecial HID_PROP_INPUT_REQUIRED              { HelpId = HID_PROP_INPUT_REQUIRED; }
-hidspecial HID_PROP_WRITING_MODE                { HelpId = HID_PROP_WRITING_MODE; }
-hidspecial HID_PROP_ENABLE_VISIBLE              { HelpId = HID_PROP_ENABLE_VISIBLE; }
-hidspecial HID_PROP_WHEEL_BEHAVIOR              { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
-hidspecial HID_PROP_ANCHOR_TYPE                 { HelpId = HID_PROP_ANCHOR_TYPE; }